Skip to content

Commit 1d11190

Browse files
committed
Makefile: add target for mypy without --py2 flag
1 parent c6c88f1 commit 1d11190

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
build/
77
dist/
88
ruamel
9-
typeshed/2.7/ruamel/yaml
9+
typeshed/2and3/ruamel/yaml
1010
# virtualenv
1111
venv/
1212
.cache/

Makefile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,22 @@ list-author-emails:
165165
@echo 'name, E-Mail Address'
166166
@git log --format='%aN,%aE' | sort -u | grep -v 'root'
167167

168-
mypy: ${PYSOURCES}
169-
rm -Rf typeshed/2.7/ruamel/yaml
168+
mypy2: ${PYSOURCES}
169+
rm -Rf typeshed/2and3/ruamel/yaml
170170
ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
171-
typeshed/2.7/ruamel/
171+
typeshed/2and3/ruamel/
172172
MYPYPATH=$MYPYPATH:typeshed/2.7:typeshed/2and3 mypy --py2 --disallow-untyped-calls \
173173
--warn-redundant-casts --warn-unused-ignores \
174174
schema_salad
175175

176+
mypy: ${PYSOURCES}
177+
rm -Rf typeshed/2and3/ruamel/yaml
178+
ln -s $(shell python -c 'from __future__ import print_function; import ruamel.yaml; import os.path; print(os.path.dirname(ruamel.yaml.__file__))') \
179+
typeshed/2and3/ruamel/
180+
MYPYPATH=$MYPYPATH:typeshed/3:typeshed/2and3 mypy --disallow-untyped-calls \
181+
--warn-redundant-casts --warn-unused-ignores \
182+
schema_salad
183+
176184
jenkins:
177185
rm -Rf env && virtualenv env
178186
. env/bin/activate ; \

tox.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ whitelist_externals =
2828
py{27,33,34,35,36}-lint: flake8
2929

3030
[testenv:py35-mypy]
31-
commands = make mypy
31+
commands =
32+
make mypy2
33+
# make mypy # not enabled for now
3234
whitelist_externals = make
3335
deps =
3436
-rmypy_requirements.txt
File renamed without changes.

0 commit comments

Comments
 (0)