Drop support for Python 3.8

miscellaneous formatting & pyupgrade

Author: mr-c

.github/workflows/ci-tests.yml

@@ -22,11 +22,8 @@ jobs:
       matrix:
         # The README.rst file mentions the versions tested, please update it as well
         py-ver-major: [3]
-        py-ver-minor: [8, 9, 10, 11, 12, 13]
+        py-ver-minor: [9, 10, 11, 12, 13]
         step: [lint, unit, mypy, bandit]
-        exclude:
-          - step: mypy
-            py-ver-minor: 8
 
     env:
       py-semver: ${{ format('{0}.{1}', matrix.py-ver-major, matrix.py-ver-minor) }}

Makefile

@@ -168,7 +168,7 @@ mypy: $(PYSOURCES)
 	MYPYPATH=$$MYPYPATH:mypy-stubs mypy $^
 
 pyupgrade: $(filter-out schema_salad/metaschema.py,$(PYSOURCES))
-	pyupgrade --exit-zero-even-if-changed --py38-plus $^
+	pyupgrade --exit-zero-even-if-changed --py39-plus $^
 	auto-walrus $^
 
 release-test: FORCE

README.rst

@@ -32,7 +32,7 @@ This is a testing tool for checking the output of Tools and Workflows described
 with the Common Workflow Language.  Among other uses, it is used to run the CWL
 conformance tests.
 
-This is written and tested for Python 3.8, 3.9, 3.10, 3.11, 3.12, and 3.13.
+This is written and tested for Python 3.9, 3.10, 3.11, 3.12, and 3.13.
 
 .. contents:: Table of Contents
    :local:

cwltest/compare.py

@@ -2,7 +2,8 @@
 
 import hashlib
 import json
-from typing import Any, Callable, Dict, Optional, Set
+from typing import Any, Callable, Optional
+
 import cwltest.stdfsaccess
 
 fs_access = cwltest.stdfsaccess.StdFsAccess("")
@@ -26,7 +27,7 @@ def format(
 
 
 def _check_keys(
-    keys: Set[str], expected: Dict[str, Any], actual: Dict[str, Any], skip_details: bool
+    keys: set[str], expected: dict[str, Any], actual: dict[str, Any], skip_details: bool
 ) -> None:
     for k in keys:
         try:
@@ -37,7 +38,7 @@ def _check_keys(
             ) from e
 
 
-def _compare_contents(expected: Dict[str, Any], actual: Dict[str, Any]) -> None:
+def _compare_contents(expected: dict[str, Any], actual: dict[str, Any]) -> None:
     with open(actual["path"]) as f:
         actual_contents = f.read()
     if (expected_contents := expected["contents"]) != actual_contents:
@@ -52,7 +53,7 @@ def _compare_contents(expected: Dict[str, Any], actual: Dict[str, Any]) -> None:
 
 
 def _compare_dict(
-    expected: Dict[str, Any], actual: Dict[str, Any], skip_details: bool
+    expected: dict[str, Any], actual: dict[str, Any], skip_details: bool
 ) -> None:
     for c in expected:
         try:
@@ -68,7 +69,7 @@ def _compare_dict(
 
 
 def _compare_directory(
-    expected: Dict[str, Any], actual: Dict[str, Any], skip_details: bool
+    expected: dict[str, Any], actual: dict[str, Any], skip_details: bool
 ) -> None:
     if actual.get("class") != "Directory":
         raise CompareFail.format(
@@ -97,7 +98,7 @@ def _compare_directory(
 
 
 def _compare_file(
-    expected: Dict[str, Any], actual: Dict[str, Any], skip_details: bool
+    expected: dict[str, Any], actual: dict[str, Any], skip_details: bool
 ) -> None:
     _compare_location(expected, actual, skip_details)
     if "contents" in expected:
@@ -117,7 +118,7 @@ def _compare_file(
 
 
 def _compare_location(
-    expected: Dict[str, Any], actual: Dict[str, Any], skip_details: bool
+    expected: dict[str, Any], actual: dict[str, Any], skip_details: bool
 ) -> None:
     if "path" in expected:
         expected_comp = "path"
@@ -160,7 +161,7 @@ def _compare_location(
         )
 
 
-def _compare_checksum(expected: Dict[str, Any], actual: Dict[str, Any]) -> None:
+def _compare_checksum(expected: dict[str, Any], actual: dict[str, Any]) -> None:
     if "path" in actual:
         path = actual["path"]
     else:
@@ -195,7 +196,7 @@ def _compare_checksum(expected: Dict[str, Any], actual: Dict[str, Any]) -> None:
             )
 
 
-def _compare_size(expected: Dict[str, Any], actual: Dict[str, Any]) -> None:
+def _compare_size(expected: dict[str, Any], actual: dict[str, Any]) -> None:
     if "path" in actual:
         path = actual["path"]
     else:

cwltest/hooks.py

@@ -1,13 +1,13 @@
 """Hooks for pytest-cwl users."""
 
-from typing import Any, Dict, Optional, Tuple
+from typing import Any, Optional
 
 from cwltest import utils
 
 
 def pytest_cwl_execute_test(  # type: ignore[empty-body]
     config: utils.CWLTestConfig, processfile: str, jobfile: Optional[str]
-) -> Tuple[int, Optional[Dict[str, Any]]]:
+) -> tuple[int, Optional[dict[str, Any]]]:
     """
     Execute CWL test using a Python function instead of a command line runner.
 

cwltest/main.py

@@ -6,22 +6,22 @@
 import sys
 from collections import Counter, defaultdict
 from concurrent.futures import ThreadPoolExecutor
-from typing import Dict, List, Optional, Set, cast
+from typing import Optional, cast
 
 import junit_xml
 import schema_salad.avro
 import schema_salad.ref_resolver
 import schema_salad.schema
+from schema_salad.exceptions import ValidationException
+
+from cwltest import logger, utils
 from cwltest.argparser import arg_parser
 from cwltest.utils import (
     CWLTestConfig,
     CWLTestReport,
     TestResult,
     load_optional_fsaccess_plugin,
 )
-from schema_salad.exceptions import ValidationException
-
-from cwltest import logger, utils
 
 if sys.stderr.isatty():
     PREFIX = "\r"
@@ -33,7 +33,7 @@
 
 def _run_test(
     args: argparse.Namespace,
-    test: Dict[str, str],
+    test: dict[str, str],
     test_number: int,
     total_tests: int,
 ) -> TestResult:
@@ -78,8 +78,8 @@ def _run_test(
     return utils.run_test_plain(config, test, test_number)
 
 
-def _expand_number_range(nr: str) -> List[int]:
-    result: List[int] = []
+def _expand_number_range(nr: str) -> list[int]:
+    result: list[int] = []
     for s in nr.split(","):
         sp = s.split("-")
         if len(sp) == 2:
@@ -123,8 +123,8 @@ def main() -> int:
 
     load_optional_fsaccess_plugin()
 
-    ntotal: Dict[str, int] = Counter()
-    npassed: Dict[str, List[CWLTestReport]] = defaultdict(list)
+    ntotal: dict[str, int] = Counter()
+    npassed: dict[str, list[CWLTestReport]] = defaultdict(list)
 
     if args.only_tools:
         alltests = tests
@@ -161,7 +161,7 @@ def main() -> int:
             logger.warning("The `id` field is missing.")
 
     if args.show_tags:
-        alltags: Set[str] = set()
+        alltags: set[str] = set()
         for t in tests:
             ts = t.get("tags", [])
             alltags |= set(ts)

cwltest/plugin.py

@@ -5,27 +5,16 @@
 import os
 import time
 import traceback
+from collections.abc import Iterator
 from io import StringIO
 from pathlib import Path
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Dict,
-    Iterator,
-    List,
-    Optional,
-    Protocol,
-    Set,
-    Tuple,
-    Union,
-    cast,
-)
+from typing import TYPE_CHECKING, Any, Optional, Protocol, Union, cast
 from urllib.parse import urljoin
 
 import pytest
-from cwltest.compare import CompareFail, compare
 
 from cwltest import REQUIRED, UNSUPPORTED_FEATURE, logger, utils
+from cwltest.compare import CompareFail, compare
 
 if TYPE_CHECKING:
     from _pytest._code.code import ExceptionInfo, TracebackStyle
@@ -42,12 +31,12 @@ class TestRunner(Protocol):
 
     def __call__(
         self, config: utils.CWLTestConfig, processfile: str, jobfile: Optional[str]
-    ) -> List[Optional[Dict[str, Any]]]:
+    ) -> list[Optional[dict[str, Any]]]:
         """Type signature for pytest_cwl_execute_test hook results."""
         ...
 
 
-def _get_comma_separated_option(config: "Config", name: str) -> List[str]:
+def _get_comma_separated_option(config: "Config", name: str) -> list[str]:
     options = config.getoption(name)
     if options is None:
         return []
@@ -58,7 +47,7 @@ def _get_comma_separated_option(config: "Config", name: str) -> List[str]:
 
 
 def _run_test_hook_or_plain(
-    test: Dict[str, str],
+    test: dict[str, str],
     config: utils.CWLTestConfig,
     hook: "HookCaller",
 ) -> utils.TestResult:
@@ -76,7 +65,7 @@ def _run_test_hook_or_plain(
     hook_out = hook(config=config, processfile=processfile, jobfile=jobfile)
     if not hook_out:
         return utils.run_test_plain(config, test)
-    returncode, out = cast(Tuple[int, Optional[Dict[str, Any]]], hook_out[0])
+    returncode, out = cast(tuple[int, Optional[dict[str, Any]]], hook_out[0])
     duration = time.time() - start_time
     outstr = json.dumps(out) if out is not None else "{}"
     if returncode == UNSUPPORTED_FEATURE:
@@ -164,7 +153,7 @@ def __init__(
         self,
         name: str,
         parent: Optional["Node"],
-        spec: Dict[str, Any],
+        spec: dict[str, Any],
     ) -> None:
         """Initialize this CWLItem."""
         super().__init__(name, parent)
@@ -198,7 +187,7 @@ def runtest(self) -> None:
             hook,
         )
         cwl_results = self.config.cwl_results  # type: ignore[attr-defined]
-        cast(List[Tuple[Dict[str, Any], utils.TestResult]], cwl_results).append(
+        cast(list[tuple[dict[str, Any], utils.TestResult]], cwl_results).append(
             (self.spec, result)
         )
         if result.return_code != 0:
@@ -238,7 +227,7 @@ def repr_failure(
                 )
             )
 
-    def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str]:
+    def reportinfo(self) -> tuple[Union["os.PathLike[str]", str], Optional[int], str]:
         """Status report."""
         return self.path, 0, "cwl test: %s" % self.name
 
@@ -258,10 +247,10 @@ def _add_global_properties(self) -> None:
 
     def collect(self) -> Iterator[CWLItem]:
         """Load the cwltest file and yield parsed entries."""
-        include: Set[str] = set(_get_comma_separated_option(self.config, "cwl_include"))
-        exclude: Set[str] = set(_get_comma_separated_option(self.config, "cwl_exclude"))
-        tags: Set[str] = set(_get_comma_separated_option(self.config, "cwl_tags"))
-        exclude_tags: Set[str] = set(
+        include: set[str] = set(_get_comma_separated_option(self.config, "cwl_include"))
+        exclude: set[str] = set(_get_comma_separated_option(self.config, "cwl_exclude"))
+        tags: set[str] = set(_get_comma_separated_option(self.config, "cwl_tags"))
+        exclude_tags: set[str] = set(
             _get_comma_separated_option(self.config, "cwl_exclude_tags")
         )
         tests, _ = utils.load_and_validate_tests(str(self.path))
@@ -302,7 +291,7 @@ def collect(self) -> Iterator[CWLItem]:
             yield item
 
 
-__OPTIONS: List[Tuple[str, Dict[str, Any]]] = [
+__OPTIONS: list[tuple[str, dict[str, Any]]] = [
     (
         "--cwl-runner",
         {
@@ -400,14 +389,14 @@ def pytest_collect_file(
 
 def pytest_configure(config: "PytestConfig") -> None:
     """Store the raw tests and the test results."""
-    cwl_results: List[Tuple[Dict[str, Any], utils.TestResult]] = []
+    cwl_results: list[tuple[dict[str, Any], utils.TestResult]] = []
     config.cwl_results = cwl_results  # type: ignore[attr-defined]
 
 
 def pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None:
     """Generate badges."""
     cwl_results = cast(
-        List[Tuple[Dict[str, Any], utils.TestResult]],
+        list[tuple[dict[str, Any], utils.TestResult]],
         getattr(session.config, "cwl_results", None),
     )
     if not cwl_results: