diff --git a/test-requirements.txt b/test-requirements.txt index 591debf04bc..731e4e59ce4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -21,5 +21,5 @@ testtools>=2.4.0 # MIT # so we need to pin it here to a known working version bandit==1.6.0 # Apache-2.0 doc8>=0.8.1 # Apache-2.0 -mypy>=0.782 # MIT +mypy>=0.910 # MIT moto>=1.3.15 # Apache-2.0 diff --git a/tools/mypywrap.sh b/tools/mypywrap.sh index b1ada5f838c..433312152e6 100755 --- a/tools/mypywrap.sh +++ b/tools/mypywrap.sh @@ -17,8 +17,8 @@ export MYPYPATH=$ROOT_DIR/../cinder/tests/stubs/ if [ $# -eq 0 ]; then # if no arguments provided, use the standard converted lists lines=$(grep -v '#' $ROOT_DIR/../mypy-files.txt) - python -m mypy ${lines[@]} + python -m mypy $OS_MYPY_OPTS ${lines[@]} else # else test what the user asked us to - python -m mypy $@ + python -m mypy $OS_MYPY_OPTS $@ fi diff --git a/tox.ini b/tox.ini index e3e54544feb..d5733e5aef2 100644 --- a/tox.ini +++ b/tox.ini @@ -169,7 +169,8 @@ usedevelop = False [testenv:mypy] description = Run type checks. -envdir = {toxworkdir}/pep8 +setenv = + OS_MYPY_OPTS=--install-types --non-interactive commands = {toxinidir}/tools/mypywrap.sh {posargs}