run mypy on all Python 3.x (#873)

* run mypy on all Python 3.x

Author: mr-c

tox.ini

@@ -2,7 +2,7 @@
 envlist =
   py{27,34,35,36,37}-lint,
   py{27,34,35,36,37}-unit,
-  py35-mypy{2,3},
+  py{34,35,36,36}-mypy{2,3},
   py27-pipconflictchecker,
   py27-lint-readme,
   py27-pydocstyle
@@ -22,13 +22,13 @@ 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
   py{27,34,35,36,37}-unit: -rtest-requirements.txt
   py{27,34,35,36,37}-unit: galaxy-lib
   py{27,34,35,36,37}-lint: flake8
+  py{34,35,36,36}-mypy{2,3}: mypy==0.620
 
 setenv =
   py{27,34,35,36,37}-unit: LC_ALL = C
@@ -38,17 +38,12 @@ commands =
   py{27,34,35,36,37}-unit: python setup.py test --addopts "--cov-report xml --cov cwltool {posargs}"
   py{27,34,35,36,37}-unit: codecov
   py{27,34,35,36,37}-lint: flake8 schema_salad setup.py
+  py{34,35,36,36}-mypy2: make mypy2
+  py{34,35,36,36}-mypy3: make mypy3
 
 whitelist_externals =
   py{27,34,35,36,37}-lint: flake8
-
-[testenv:py35-mypy2]
-commands = make mypy2
-whitelist_externals = make
-
-[testenv:py35-mypy3]
-commands = make mypy3
-whitelist_externals = make
+  py{34,35,36,36}-mypy{2,3}: make
 
 [testenv:py27-pipconflictchecker]
 commands = pipconflictchecker