upgrade to mypy 0.800

Author: mr-c

.github/workflows/ci-tests.yml

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

cwltool/context.py

@@ -8,7 +8,8 @@
 # move to a regular typing import when Python 3.3-3.6 is no longer supported
 from ruamel.yaml.comments import CommentedMap
 from schema_salad.avro.schema import Names
-from schema_salad.ref_resolver import FetcherCallableType, Loader
+from schema_salad.ref_resolver import Loader
+from schema_salad.utils import FetcherCallableType
 from typing_extensions import TYPE_CHECKING
 
 from .builder import Builder, HasReqsHints

cwltool/cwlrdf.py

@@ -5,7 +5,7 @@
 from rdflib import Graph
 from ruamel.yaml.comments import CommentedMap
 from schema_salad.jsonld_context import makerdf
-from schema_salad.ref_resolver import ContextType
+from schema_salad.utils import ContextType
 
 from .cwlviewer import CWLViewer
 from .process import Process

cwltool/main.py

@@ -37,14 +37,12 @@
 from ruamel.yaml.comments import CommentedMap, CommentedSeq
 from schema_salad.exceptions import ValidationException
 from schema_salad.ref_resolver import (
-    ContextType,
-    FetcherCallableType,
     Loader,
     file_uri,
     uri_file_path,
 )
 from schema_salad.sourceline import strip_dup_lineno
-from schema_salad.utils import json_dumps
+from schema_salad.utils import json_dumps, ContextType, FetcherCallableType
 
 from . import command_line_tool, workflow
 from .argparser import arg_parser, generate_parser, get_default_args

cwltool/mpi.py

@@ -53,7 +53,7 @@ def load(cls: Type[MpiConfigT], config_file_name: str) -> MpiConfigT:
         optional).
         """
         with open(config_file_name) as cf:
-            data = yaml.round_trip_load(cf)
+            data = yaml.main.round_trip_load(cf)
         try:
             return cls(**data)
         except TypeError as e:

cwltool/mutation.py

@@ -4,7 +4,7 @@
 from .errors import WorkflowException
 from .utils import CWLObjectType
 
-MutationState = namedtuple("MutationTracker", ["generation", "readers", "stepname"])
+MutationState = namedtuple("MutationState", ["generation", "readers", "stepname"])
 
 _generation = "http://commonwl.org/cwltool#generation"
 

cwltool/pack.py

@@ -15,7 +15,8 @@
 )
 
 from ruamel.yaml.comments import CommentedMap, CommentedSeq
-from schema_salad.ref_resolver import Loader, ResolveType, SubLoader
+from schema_salad.ref_resolver import Loader, SubLoader
+from schema_salad.utils import ResolveType
 
 from .context import LoadingContext
 from .load_tool import fetch_document, resolve_and_validate_document

cwltool/validate_js.py

@@ -116,7 +116,7 @@ def get_expressions(
         return []
 
 
-JSHintJSReturn = namedtuple("jshint_return", ["errors", "globals"])
+JSHintJSReturn = namedtuple("JSHintJSReturn", ["errors", "globals"])
 
 
 def jshint_js(

mypy.ini

@@ -1,8 +1,8 @@
 [mypy]
-# --strict options as of mypy 0.720
+# --strict options as of mypy 0.800
 warn_unused_configs = True
-disallow_subclassing_any = True
 disallow_any_generics = True
+disallow_subclassing_any = True
 disallow_untyped_calls = True
 disallow_untyped_defs = True
 disallow_incomplete_defs = True
@@ -12,7 +12,8 @@ no_implicit_optional = True
 warn_redundant_casts = True
 warn_unused_ignores = True
 warn_return_any = True
-implicit_reexport = True
+implicit_reexport = False
+strict_equality = True
 
 [mypy-schema_salad.tests.*]
 ignore_errors = True

setup.py

@@ -121,7 +121,7 @@
     setup_requires=PYTEST_RUNNER,
     test_suite="tests",
     tests_require=[
-        "pytest == 6.0.2",
+        "pytest >= 6.0.2, < 6.2",
         "mock >= 2.0.0",
         "pytest-mock >= 1.10.0",
         "arcp >= 0.2.0",