From 4f0ad4ff19b73e3fbee1cc664613813bbb15fe84 Mon Sep 17 00:00:00 2001 From: Manvendra Singh Date: Fri, 16 Jun 2017 01:50:10 +0530 Subject: [PATCH] tox: separate out mypy targets for py2 and py3 --- Makefile | 2 +- tox.ini | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d54c67b6b..0c9e0a9e7 100644 --- 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 index 94686256f..2a50b71e6 100644 --- 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