Merge pull request #1236 from common-workflow-language/ruamel_up_to_0.16.5

max ruamel.yaml is 0.16.5; update mypy

Author: mr-c

cwltool/argparser.py

@@ -766,11 +766,11 @@ def add_argument(
     else:
         typekw = {}
 
-    toolparser.add_argument(  # type: ignore
+    toolparser.add_argument(
         flag + name,
         required=required,
         help=ahelp,
-        action=action,
+        action=action,  # type: ignore
         default=default,
         **typekw
     )

cwltool/validate_js.py

@@ -83,7 +83,7 @@ def get_expressions(
             itertools.chain(
                 *map(
                     lambda x: get_expressions(
-                        x[1], schema.items, SourceLine(tool, x[0])
+                        x[1], schema.items, SourceLine(tool, x[0])  # type: ignore
                     ),
                     enumerate(tool),
                 )

requirements.txt

@@ -1,5 +1,5 @@
 requests>=2.4.3
-ruamel.yaml>=0.12.4,<=0.16
+ruamel.yaml>=0.12.4,<=0.16.5
 rdflib>=4.2.2,<4.3
 shellescape>=3.4.1,<3.5
 schema-salad>=5,<6

setup.py

@@ -58,7 +58,7 @@
         "setuptools",
         "requests >= 2.6.1",  # >= 2.6.1 to workaround
         # https://github.com/ionrock/cachecontrol/issues/137
-        "ruamel.yaml >= 0.12.4, <= 0.16",
+        "ruamel.yaml >= 0.12.4, <= 0.16.5",
         "rdflib >= 4.2.2, < 4.3.0",
         "shellescape >= 3.4.1, < 3.5",
         "schema-salad >= 5, < 6",

tox.ini

@@ -38,7 +38,7 @@ deps =
   py{35,36,37,38}-unit: galaxy-tool-util
   py{35,36,37,38}-lint: flake8
   py{35,36,37,38}-bandit: bandit
-  py{35,36,37,38}-mypy: mypy==0.720
+  py{35,36,37,38}-mypy: mypy==0.761
 
 setenv =
   py{35,36,37,38}-unit: LC_ALL = C