Revert "add back in Python 3.7 for one last release"

This reverts commit 6c32ae5.

Author: mr-c

.github/workflows/ci-tests.yml

@@ -32,18 +32,8 @@ jobs:
     strategy:
       matrix:
         py-ver-major: [3]
-        py-ver-minor: [7, 8, 9, 10, 11, 12]
+        py-ver-minor: [8, 9, 10, 11, 12]
         step: [lint, unit, bandit, mypy]
-        exclude:
-          - py-ver-major: 3
-            py-ver-minor: 7
-            step: mypy
-          - py-ver-major: 3
-            py-ver-minor: 7
-            step: lint
-          - py-ver-major: 3
-            py-ver-minor: 7
-            step: bandit
 
     env:
       py-semver: ${{ format('{0}.{1}', matrix.py-ver-major, matrix.py-ver-minor) }}

cwltool/checker.py

@@ -5,14 +5,14 @@
     Dict,
     Iterator,
     List,
+    Literal,
     MutableMapping,
     MutableSequence,
     Optional,
     Sized,
     Union,
     cast,
 )
-from typing_extensions import Literal
 
 from schema_salad.exceptions import ValidationException
 from schema_salad.sourceline import SourceLine, bullets, strip_dup_lineno
@@ -509,8 +509,7 @@ def get_step_id(field_id: str) -> str:
 
 
 def is_conditional_step(param_to_step: Dict[str, CWLObjectType], parm_id: str) -> bool:
-    source_step = param_to_step.get(parm_id)
-    if source_step is not None:
+    if (source_step := param_to_step.get(parm_id)) is not None:
         if source_step.get("when") is not None:
             return True
     return False

cwltool/context.py

@@ -12,12 +12,12 @@
     Dict,
     Iterable,
     List,
+    Literal,
     Optional,
     TextIO,
     Tuple,
     Union,
 )
-from typing_extensions import Literal
 
 from ruamel.yaml.comments import CommentedMap
 from schema_salad.avro.schema import Names

cwltool/cwlprov/__init__.py

@@ -6,8 +6,7 @@
 import re
 import uuid
 from getpass import getuser
-from typing import IO, Any, Callable, Dict, List, Optional, Tuple, Union
-from typing_extensions import TypedDict
+from typing import IO, Any, Callable, Dict, List, Optional, Tuple, TypedDict, Union
 
 
 def _whoami() -> Tuple[str, str]:

cwltool/docker.py

@@ -113,8 +113,7 @@ def get_image(
             if docker_requirement["dockerImageId"] in _IMAGES:
                 return True
 
-        docker_image_id = docker_requirement.get("dockerImageId")
-        if docker_image_id is not None:
+        if (docker_image_id := docker_requirement.get("dockerImageId")) is not None:
             try:
                 manifest = json.loads(
                     subprocess.check_output(

cwltool/software_requirements.py

@@ -91,9 +91,8 @@ def build_job_script(self, builder: "Builder", command: List[str]) -> str:
             resolution_config_dict=resolution_config_dict,
             conf_file=self.dependency_resolvers_config_file,
         )
-        dependencies = get_dependencies(builder)
-        handle_dependencies = ""  # str
-        if dependencies:
+        handle_dependencies: str = ""
+        if dependencies := get_dependencies(builder):
             handle_dependencies = "\n".join(
                 tool_dependency_manager.dependency_shell_commands(
                     dependencies, job_directory=builder.tmpdir

cwltool/utils.py

@@ -1,6 +1,7 @@
 """Shared functions and other definitions."""
 import collections
 import fcntl
+import importlib.metadata
 import os
 import random
 import shutil
@@ -27,16 +28,17 @@
     Generator,
     Iterable,
     List,
+    Literal,
     MutableMapping,
     MutableSequence,
     NamedTuple,
     Optional,
     Set,
     Tuple,
+    TypedDict,
     Union,
     cast,
 )
-from typing_extensions import Literal, TypedDict
 
 import requests
 from cachecontrol import CacheControl
@@ -45,11 +47,6 @@
 from schema_salad.exceptions import ValidationException
 from schema_salad.ref_resolver import Loader
 
-if sys.version_info >= (3, 8):
-    import importlib.metadata as importlib_metadata
-else:
-    import importlib_metadata
-
 if TYPE_CHECKING:
     from .command_line_tool import CallbackJob, ExpressionJob
     from .job import CommandLineJob, JobBase
@@ -120,8 +117,7 @@ class WorkflowStateItem(NamedTuple):
 
 def versionstring() -> str:
     """Version of CWLtool used to execute the workflow."""
-    pkg = importlib_metadata.version("cwltool")
-    if pkg:
+    if pkg := importlib.metadata.version("cwltool"):
         return f"{sys.argv[0]} {pkg}"
     return "{} {}".format(sys.argv[0], "unknown version")
 

docs/conf.py

@@ -14,6 +14,7 @@
 import sys
 from datetime import datetime
 import time
+import importlib.metadata
 
 sys.path.insert(0, os.path.abspath(".."))
 
@@ -81,12 +82,7 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ["_static"]
 
-
-if sys.version_info >= (3, 8):
-    import importlib.metadata as importlib_metadata
-else:
-    import importlib_metadata
-release = importlib_metadata.version("cwltool")
+release = importlib.metadata.version("cwltool")
 version = ".".join(release.split(".")[:2])
 
 autoapi_dirs = ["../cwltool"]

gittaggers.py

@@ -2,16 +2,13 @@
 import sys
 import time
 
-if sys.version_info >= (3, 8):
-    import importlib.metadata as importlib_metadata
-else:
-    import importlib_metadata
+import importlib.metadata
 
 from typing import Any
 
 from setuptools.command.egg_info import egg_info
 
-SETUPTOOLS_VER = importlib_metadata.version("setuptools").split(".")
+SETUPTOOLS_VER = importlib.metadata.version("setuptools").split(".")
 
 RECENT_SETUPTOOLS = (
     int(SETUPTOOLS_VER[0]) > 40

pyproject.toml

@@ -15,4 +15,4 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 100
-target-version = [ "py37" ]
+target-version = [ "py38" ]