turn off travis py3 checking for now

Added mpyp3 Makefile target

Author: mr-c

Makefile

@@ -158,4 +158,15 @@ mypy: ${PYSOURCES}
 		 --warn-redundant-casts --warn-unused-ignores --fast-parser \
 		 cwltool
 
+mypy3: ${PYSOURCES}
+	rm -Rf typeshed/3/ruamel/yaml
+	ln -s $(shell python3 -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
+		typeshed/3/ruamel/yaml
+	rm -Rf typeshed/3/schema_salad
+	ln -s $(shell python3 -c 'from __future__ import print_function; import schema_salad; import os.path; print(os.path.dirname(schema_salad.__file__))') \
+		typeshed/3/schema_salad
+	MYPYPATH=typeshed/3 mypy --disallow-untyped-calls \
+		 --warn-redundant-casts --warn-unused-ignores --fast-parser \
+		 cwltool
+
 FORCE:

cwltool/expression.py

@@ -25,7 +25,7 @@ def jshead(engineConfig, rootvars):
 segment_re = re.compile(segments, flags=re.UNICODE)
 param_re = re.compile(r"\((%s)%s*\)$" % (seg_symbol, segments), flags=re.UNICODE)
 
-JSON = Union[Dict[Any, Any], List[Any], Text, int, long, float, bool, None]
+JSON = Union[Dict[Any, Any], List[Any], Text, int, float, bool, None]
 
 
 class SubstitutionError(Exception):

cwltool/sandboxjs.py

@@ -10,14 +10,13 @@
 from pkg_resources import resource_stream
 from typing import Any, Dict, List, Mapping, Text, Union
 
-
 class JavascriptException(Exception):
     pass
 
 
 _logger = logging.getLogger("cwltool")
 
-JSON = Union[Dict[Text, Any], List[Any], Text, int, long, float, bool, None]
+JSON = Union[Dict[Text, Any], List[Any], Text, int, float, bool, None]
 
 localdata = threading.local()
 

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, py27-pipconflictchecker, py35-mypy, py36-lint, py35-lint, py34-lint, py33-lint
+#envlist = py27-lint, py27-unit, py27-pipconflictchecker, py33-lint, py33-unit, py34-lint, py34-unit, py35-py2_mypy, py35-mypy, py35-lint, py35-unit, py36-lint, py36-unit  # only when py3 compat is done
+envlist = py27-lint, py27-unit, py27-pipconflictchecker, py36-lint, py35-lint, py34-lint, py33-lint
 skipsdist = True
 
 [tox:travis]
@@ -10,14 +10,23 @@ skipsdist = True
 [testenv]
 deps = -rrequirements.txt
 
-[testenv:py35-mypy]
+[testenv:py35-py2_mypy]
 commands = make mypy
 whitelist_externals = make
 deps =
   mypy>=0.470
   typed-ast==0.6.3
   -rrequirements.txt
 
+[testenv:py35-mypy]
+commands = make mypy3
+whitelist_externals = make
+deps =
+  mypy>=0.470
+  typed-ast==0.6.3
+  -rrequirements.txt
+
+
 [testenv:py36-lint]
 commands = flake8 cwltool setup.py
 whitelist_externals = flake8