Minor changes needed to support Python 3.10

Author: ChrisMayfield

jmu_pytest_utils/coverage.py

@@ -160,13 +160,16 @@ def assert_cover(main_filename: str, test_filename: str, branches: bool = False,
         line_penalty: Points per missed line.
         branch_penalty: Points per missed branch.
     """
-    run_command([
+    args = [
         "pytest",
         "--cov=" + main_filename[:-3],  # remove .py suffix
-        "--cov-branch" if branches else "",
         "--cov-report=json",
         test_filename
-    ])
+    ]
+    if branches:
+        # Using insert to avoid sending an empty string to subprocess.run()
+        args.insert(2, "--cov-branch")
+    run_command(args)
     if not os.path.exists("coverage.json"):
         pytest.fail("pytest failed to generate coverage results", False)
     with open("coverage.json") as file:

jmu_pytest_utils/quiz.py

@@ -52,7 +52,7 @@ def _type_name(value: Any) -> str:
 
 
 def check_return_types(
-    *calls: tuple[type, Callable[..., Any], *tuple[Any, ...]],
+    *calls: tuple[type, Callable[..., Any], tuple[Any, ...]],
 ) -> None:
     """Verify the return type of one or more function calls.
 
@@ -67,7 +67,7 @@ def check_return_types(
         calls: Tuples of (expected_type, function, *args).
     """
     output = ""
-    for expected_type, function, *args in calls:
+    for expected_type, function, args in calls:
         try:
             result = function(*args)
             if isinstance(result, expected_type):

setup.py

@@ -8,6 +8,7 @@
     description="pytest plugin for Gradescope autograders",
     author="Chris Mayfield",
     author_email="[email protected]",
+    url="https://github.com/JMU-CS/jmu_pytest_utils",
     packages=find_packages(),
     classifiers=[
         "Framework :: Pytest",
@@ -31,4 +32,5 @@
             "jmu_pytest_utils = jmu_pytest_utils.plugin",
         ],
     },
+    python_requires=">=3.10",
 )