type updates for mypy 1.7.0

common-workflow-language · Nov 13, 2023 · e711fe1 · e711fe1
1 parent 09b939e
commit e711fe1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/cwltool/job.py b/cwltool/job.py
@@ -66,6 +66,11 @@
     from .cwlprov.provenance_profile import (
         ProvenanceProfile,  # pylint: disable=unused-import
     )
+
+    CollectOutputsType = Union[
+        Callable[[str, int], CWLObjectType], functools.partial[CWLObjectType]
+    ]
+
 needs_shell_quoting_re = re.compile(r"""(^$|[\s|&;()<>\'"$@])""")
 
 FORCE_SHELLED_POPEN = os.getenv("CWLTOOL_FORCE_SHELL_POPEN", "0") == "1"
@@ -112,9 +117,6 @@ def neverquote(string: str, pos: int = 0, endpos: int = 0) -> Optional[Match[str
     return None
 
 
-CollectOutputsType = Union[Callable[[str, int], CWLObjectType], functools.partial]
-
-
 class JobBase(HasReqsHints, metaclass=ABCMeta):
     def __init__(
         self,
@@ -144,7 +146,7 @@ def __init__(
         self.generatemapper: Optional[PathMapper] = None
 
         # set in CommandLineTool.job(i)
-        self.collect_outputs = cast(CollectOutputsType, None)
+        self.collect_outputs = cast("CollectOutputsType", None)
         self.output_callback: Optional[OutputCallbackType] = None
         self.outdir = ""
         self.tmpdir = ""

diff --git a/mypy.ini b/mypy.ini
@@ -5,7 +5,6 @@ show_column_numbers = true
 show_error_codes = true
 pretty = true
 warn_unreachable = True
-new_type_inference = True
 
 [mypy-galaxy.tool_util.*]
 ignore_missing_imports = True

diff --git a/tests/test_singularity_versions.py b/tests/test_singularity_versions.py
@@ -21,7 +21,7 @@ def reset_singularity_version_cache() -> None:
 def set_dummy_check_output(name: str, version: str) -> None:
     """Mock out subprocess.check_output."""
     cwltool.singularity.check_output = (  # type: ignore[attr-defined]
-        lambda c, text: name + " version " + version
+        lambda c, text: name + " version " + version  # type: ignore[assignment]
     )