Skip to content

Commit 4f0ad4f

Browse files
committed
tox: separate out mypy targets for py2 and py3
1 parent d16c0e5 commit 4f0ad4f

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ mypy2: ${PYSOURCES}
173173
--warn-redundant-casts --warn-unused-ignores \
174174
schema_salad
175175

176-
mypy: ${PYSOURCES}
176+
mypy3: ${PYSOURCES}
177177
rm -Rf typeshed/2and3/ruamel/yaml
178178
ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
179179
typeshed/2and3/ruamel/

tox.ini

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
envlist =
33
py{27,33,34,35,36}-lint,
44
py{27,33,34,35,36}-unit,
5-
py35-mypy,
5+
py35-mypy{2,3},
66
py27-pipconflictchecker
77

88
skipsdist = True
@@ -27,10 +27,17 @@ commands =
2727
whitelist_externals =
2828
py{27,33,34,35,36}-lint: flake8
2929

30-
[testenv:py35-mypy]
30+
[testenv:py35-mypy2]
3131
commands =
3232
make mypy2
33-
# make mypy # not enabled for now
33+
whitelist_externals = make
34+
deps =
35+
-rmypy_requirements.txt
36+
-rrequirements.txt
37+
38+
[testenv:py35-mypy3]
39+
commands =
40+
make mypy3
3441
whitelist_externals = make
3542
deps =
3643
-rmypy_requirements.txt

0 commit comments

Comments
 (0)