[github-actions] Apply auto-formatting using ruff

Author: github-actions

glossary_branch_pull/download.py

@@ -35,6 +35,7 @@ def setup(verbose: bool = False):
         "d.txt",
         """
         documentation: Evidence that someone once cared.
-        """)
+        """,
+    )
     add(["d.txt"], verbose)
     commit("Add 'documentation'", verbose)

glossary_branch_pull/test_verify.py

@@ -1,7 +1,11 @@
 from contextlib import contextmanager
 from typing import Iterator, Tuple
 
-from exercise_utils.test import GitAutograderTest, GitAutograderTestLoader, assert_output
+from exercise_utils.test import (
+    GitAutograderTest,
+    GitAutograderTestLoader,
+    assert_output,
+)
 from git_autograder import GitAutograderStatus
 from repo_smith.repo_smith import RepoSmith
 
@@ -23,7 +27,7 @@ def base_setup() -> Iterator[Tuple[GitAutograderTest, RepoSmith]]:
     with loader.start(include_remote_repo=True) as (test, rs, rs_remote):
         remote_path = str(rs_remote.repo.git_dir)
         rs.git.remote_add("origin", remote_path)
-        
+
         rs.git.commit(allow_empty=True, message="Initial commit")
 
         rs.git.checkout("ABC", branch=True)
@@ -39,6 +43,7 @@ def base_setup() -> Iterator[Tuple[GitAutograderTest, RepoSmith]]:
 
         yield (test, rs)
 
+
 def test_no_changes():
     with base_setup() as (test, rs):
         output = test.run()
@@ -49,9 +54,10 @@ def test_no_changes():
                 BRANCH_MISSING.format(branch="STU"),
                 BRANCH_MISSING.format(branch="VWX"),
                 REMOTE_COMMIT_MISSING.format(branch="ABC"),
-                REMOTE_COMMIT_MISSING.format(branch="DEF")
-            ])
-        
+                REMOTE_COMMIT_MISSING.format(branch="DEF"),
+            ],
+        )
+
 
 def test_branch_not_tracking():
     with base_setup() as (test, rs):
@@ -66,9 +72,10 @@ def test_branch_not_tracking():
                 BRANCH_NOT_TRACKING.format(branch="STU"),
                 BRANCH_NOT_TRACKING.format(branch="VWX"),
                 REMOTE_COMMIT_MISSING.format(branch="ABC"),
-                REMOTE_COMMIT_MISSING.format(branch="DEF")
-            ])
-        
+                REMOTE_COMMIT_MISSING.format(branch="DEF"),
+            ],
+        )
+
 
 def test_def_local_commit_missing():
     with base_setup() as (test, rs):
@@ -87,11 +94,8 @@ def test_def_local_commit_missing():
         rs.git.merge("origin/DEF")
 
         output = test.run()
-        assert_output(
-            output,
-            GitAutograderStatus.UNSUCCESSFUL,
-            [LOCAL_COMMIT_MISSING])
-        
+        assert_output(output, GitAutograderStatus.UNSUCCESSFUL, [LOCAL_COMMIT_MISSING])
+
 
 def test_successful_changes():
     with base_setup() as (test, rs):
@@ -110,4 +114,4 @@ def test_successful_changes():
         rs.git.merge("origin/DEF")
 
         output = test.run()
-        assert_output(output, GitAutograderStatus.SUCCESSFUL)
+        assert_output(output, GitAutograderStatus.SUCCESSFUL)

glossary_branch_pull/verify.py

@@ -9,28 +9,34 @@
 BRANCH_MISSING = "The local {branch} branch is not created."
 BRANCH_NOT_TRACKING = "The local {branch} branch does not track origin/{branch}."
 REMOTE_COMMIT_MISSING = "New commit in the remote {branch} branch is not pulled to the local {branch} branch."
-LOCAL_COMMIT_MISSING = "The original local commit on DEF is missing. " \
-"You may have lost your work instead of merging."
+LOCAL_COMMIT_MISSING = (
+    "The original local commit on DEF is missing. "
+    "You may have lost your work instead of merging."
+)
 
 
-def get_commit_from_message(commits: List[GitAutograderCommit], message: str) \
-    -> GitAutograderCommit | None:
+def get_commit_from_message(
+    commits: List[GitAutograderCommit], message: str
+) -> GitAutograderCommit | None:
     """Find a commit with the given message from a list of commits."""
     for commit in commits:
         if message.strip() == commit.commit.message.strip():
             return commit
     return None
 
-def get_commit_from_hexsha(commits: List[GitAutograderCommit], hexsha: str) \
-    -> GitAutograderCommit | None:
+
+def get_commit_from_hexsha(
+    commits: List[GitAutograderCommit], hexsha: str
+) -> GitAutograderCommit | None:
     """Find a commit with the given hexsha from a list of commits."""
     for commit in commits:
         if hexsha.strip() == commit.commit.hexsha.strip():
             return commit
     return None
 
+
 def verify(exercise: GitAutograderExercise) -> GitAutograderOutput:
-    repo = exercise.repo 
+    repo = exercise.repo
     comments = []
 
     if not repo.branches.has_branch("STU"):
@@ -58,8 +64,8 @@ def verify(exercise: GitAutograderExercise) -> GitAutograderOutput:
         if not remote_abc or remote_abc.name != "origin/ABC":
             comments.append(BRANCH_NOT_TRACKING.format(branch="ABC"))
         elif not get_commit_from_hexsha(abc_commits, remote_abc.commit.hexsha):
-                comments.append(REMOTE_COMMIT_MISSING.format(branch="ABC"))
-            
+            comments.append(REMOTE_COMMIT_MISSING.format(branch="ABC"))
+
     if not repo.branches.has_branch("DEF"):
         comments.append(BRANCH_MISSING.format(branch="DEF"))
     else:
@@ -71,10 +77,11 @@ def verify(exercise: GitAutograderExercise) -> GitAutograderOutput:
         if not remote_def or remote_def.name != "origin/DEF":
             comments.append(BRANCH_NOT_TRACKING.format(branch="DEF"))
         elif not get_commit_from_hexsha(def_commits, remote_def.commit.hexsha):
-                comments.append(REMOTE_COMMIT_MISSING.format(branch="DEF"))
+            comments.append(REMOTE_COMMIT_MISSING.format(branch="DEF"))
 
     if comments:
         raise exercise.wrong_answer(comments)
-    return exercise.to_output([
-        "Great work! All required branches are present and correctly set up."
-    ], GitAutograderStatus.SUCCESSFUL)
+    return exercise.to_output(
+        ["Great work! All required branches are present and correctly set up."],
+        GitAutograderStatus.SUCCESSFUL,
+    )