mypy0.620 (#858)

Author: mr-c

cwltool/command_line_tool.py

@@ -761,9 +761,7 @@ def collect_output(self,
                     primary["format"] = builder.do_eval(schema["format"], context=primary)
 
             # Ensure files point to local references outside of the run environment
-            adjustFileObjs(r, cast(  # known bug in mypy
-                # https://github.com/python/mypy/issues/797
-                Callable[[Any], Any], revmap))
+            adjustFileObjs(r, revmap)
 
             if not r and optional:
                 return None

cwltool/provenance.py

@@ -65,7 +65,7 @@
 
 if six.PY2:
     class PermissionError(OSError):
-        "to avoid mypy3 error"
+        "Needed for Python2."
         pass
 __citation__ = "https://doi.org/10.5281/zenodo.1208477"
 

cwltool/stdfsaccess.py

@@ -3,7 +3,7 @@
 import glob
 import os
 from io import open
-from typing import (IO, BinaryIO, List,  # pylint: disable=unused-import
+from typing import (Any, IO, BinaryIO, List,  # pylint: disable=unused-import
                     Text, Union, overload)
 
 import six
@@ -35,17 +35,7 @@ def _abs(self, p):  # type: (Text) -> Text
     def glob(self, pattern):  # type: (Text) -> List[Text]
         return [file_uri(str(self._abs(l))) for l in glob.glob(self._abs(pattern))]
 
-    # overload is related to mypy type checking and in no way
-    # modifies the behaviour of the function.
-    @overload
-    def open(self, fn, mode='rb'):  # type: (Text, str) -> IO[bytes]
-        pass
-
-    @overload
-    def open(self, fn, mode='r'):  # type: (Text, str) -> IO[str]
-        pass
-
-    def open(self, fn, mode):
+    def open(self, fn, mode):  # type: (Text, str) -> IO[Any]
         return open(self._abs(fn), mode)
 
     def exists(self, fn):  # type: (Text) -> bool

tox.ini

@@ -22,6 +22,7 @@ python =
 passenv = CI TRAVIS TRAVIS_*
 deps =
   -rrequirements.txt
+  py35-mypy{2,3}: mypy==0.620
   py{27,34,35,36,37}-unit: codecov
   py{27,34,35,36,37}-unit: pytest-xdist
   py{27,34,35,36,37}-unit: pytest-cov
@@ -44,16 +45,10 @@ whitelist_externals =
 [testenv:py35-mypy2]
 commands = make mypy2
 whitelist_externals = make
-deps =
-  mypy==0.610
-  -rrequirements.txt
 
 [testenv:py35-mypy3]
 commands = make mypy3
 whitelist_externals = make
-deps =
-  mypy==0.610
-  -rrequirements.txt
 
 [testenv:py27-pipconflictchecker]
 commands = pipconflictchecker