upgrade to mypy 0.470

Author: mr-c

cwltool/factory.py

@@ -34,10 +34,13 @@ def __call__(self, **kwargs):
 
 
 class Factory(object):
-    def __init__(self, makeTool=workflow.defaultMakeTool,
-                 executor=main.single_job_executor,
-                 **execkwargs):
-        # type: (tCallable[[Dict[Text, Any], Any], Process],tCallable[...,Tuple[Dict[Text,Any], Text]], **Any) -> None
+    def __init__(self,
+                 makeTool=workflow.defaultMakeTool,  # type: tCallable[[Any], Process]
+                 # should be tCallable[[Dict[Text, Any], Any], Process] ?
+                 executor=main.single_job_executor,  # type: tCallable[...,Tuple[Dict[Text,Any], Text]]
+                 **execkwargs  # type: Any
+                 ):
+        # type: (...) -> None
         self.makeTool = makeTool
         self.executor = executor
         self.execkwargs = execkwargs

cwltool/job.py

@@ -206,6 +206,7 @@ def run(self, dry_run=False, pull_image=True, rm_container=True,
 
         scr, _ = get_feature(self, "ShellCommandRequirement")
 
+        shouldquote = None  # type: Callable[[Any], Any]
         if scr:
             shouldquote = lambda x: False
         else:

cwltool/main.py

@@ -182,8 +182,11 @@ def arg_parser():  # type: () -> argparse.ArgumentParser
     return parser
 
 
-def single_job_executor(t, job_order_object, **kwargs):
-    # type: (Process, Dict[Text, Any], **Any) -> Tuple[Dict[Text, Any], Text]
+def single_job_executor(t,  # type: Process
+                        job_order_object,  # type: Dict[Text, Any]
+                        **kwargs  # type: Any
+                        ):
+    # type: (...) -> Tuple[Dict[Text, Any], Text]
     final_output = []
     final_status = []
 

cwltool/workflow.py

@@ -22,8 +22,10 @@
 WorkflowStateItem = namedtuple('WorkflowStateItem', ['parameter', 'value'])
 
 
-def defaultMakeTool(toolpath_object, **kwargs):
-    # type: (Dict[Text, Any], **Any) -> Process
+def defaultMakeTool(toolpath_object,  # type: Dict[Text, Any]
+                    **kwargs  # type: Any
+                   ):
+    # type: (...) -> Process
     if not isinstance(toolpath_object, dict):
         raise WorkflowException(u"Not a dict: `%s`" % toolpath_object)
     if "class" in toolpath_object:

requirements.txt

@@ -3,5 +3,5 @@ ruamel.yaml==0.13.7
 rdflib==4.2.1
 rdflib-jsonld==0.4.0
 shellescape==3.4.1
-schema-salad>=2.1.20161227155225,<3
+schema-salad>=2.1.20170208112505,<3
 typing==3.5.2.2 ; python_version>="2.7"

setup.py

@@ -47,7 +47,7 @@
           'ruamel.yaml >= 0.12.4',
           'rdflib >= 4.2.0, < 4.3.0',
           'shellescape >= 3.4.1, < 3.5',
-          'schema-salad >= 2.2.20170111180227, < 3',
+          'schema-salad >= 2.2.20170208112505, < 3',
           'typing >= 3.5.2, < 3.6'
       ],
       test_suite='tests',

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 #envlist = py35-lint,py34-lint,py33-lint,py27-lint,py35-unit,py34-unit,py33-unit,py27-unit
-envlist = py27-lint, py27-unit, pip27-pipconflictchecker, py35-mypy
+envlist = py27-lint, py27-unit, py27-pipconflictchecker, py35-mypy
 skipsdist = True
 
 [tox:travis]
@@ -14,7 +14,7 @@ deps = -rrequirements.txt
 commands = make mypy
 whitelist_externals = make
 deps =
-  mypy-lang>=0.4.4
+  mypy>=0.470
   typed-ast
   -rrequirements.txt