tox: separate out mypy targets for py2 and py3

common-workflow-language · Jun 27, 2017 · 4f0ad4f · 4f0ad4f
1 parent d16c0e5
commit 4f0ad4f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -173,7 +173,7 @@ mypy2: ${PYSOURCES}
 		 --warn-redundant-casts --warn-unused-ignores \
 		 schema_salad
 
-mypy: ${PYSOURCES}
+mypy3: ${PYSOURCES}
 	rm -Rf typeshed/2and3/ruamel/yaml
 	ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
 		typeshed/2and3/ruamel/

diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
   py{27,33,34,35,36}-lint,
   py{27,33,34,35,36}-unit,
-  py35-mypy,
+  py35-mypy{2,3},
   py27-pipconflictchecker
 
 skipsdist = True
@@ -27,10 +27,17 @@ commands =
 whitelist_externals =
   py{27,33,34,35,36}-lint: flake8
 
-[testenv:py35-mypy]
+[testenv:py35-mypy2]
 commands =
   make mypy2
-  # make mypy # not enabled for now
+whitelist_externals = make
+deps =
+  -rmypy_requirements.txt
+  -rrequirements.txt
+
+[testenv:py35-mypy3]
+commands =
+  make mypy3
 whitelist_externals = make
 deps =
   -rmypy_requirements.txt