From 04e586f90a94e64732d83a3911fdb037ab76f656 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 15 Jun 2021 12:10:36 +0200 Subject: [PATCH] global,tox.ini: add mypy-constrains.txt let's avoid getting new versions of those packages by accident. Unfortunately this means we have to manually update those packages regurarly. Signed-off-by: Sebastian Wagner --- qa/tox.ini | 3 ++- src/cephadm/tox.ini | 4 +++- src/mypy-constrains.txt | 19 +++++++++++++++++++ src/pybind/mgr/tox.ini | 3 ++- src/pybind/tox.ini | 4 +++- src/python-common/requirements.txt | 4 ++-- src/python-common/tox.ini | 1 + 7 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 src/mypy-constrains.txt diff --git a/qa/tox.ini b/qa/tox.ini index f8573a40326..083f5c3bf56 100644 --- a/qa/tox.ini +++ b/qa/tox.ini @@ -11,7 +11,7 @@ commands=flake8 --select=F,E9 --exclude=venv,.tox [testenv:mypy] basepython = python3 deps = - mypy==0.901 + mypy types-boto types-requests types-jwt @@ -19,6 +19,7 @@ deps = types-PyYAML types-cryptography types-python-dateutil + -c{toxinidir}/../src/mypy-constrains.txt commands = mypy {posargs:.} [testenv:import-tasks] diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini index 8c9422ac461..c4c45365a90 100644 --- a/src/cephadm/tox.ini +++ b/src/cephadm/tox.ini @@ -41,7 +41,9 @@ commands=pytest {posargs} [testenv:mypy] basepython = python3 -deps = mypy==0.901 +deps = + mypy + -c{toxinidir}/../mypy-constrains.txt commands = mypy --config-file ../mypy.ini {posargs:cephadm} [testenv:fix] diff --git a/src/mypy-constrains.txt b/src/mypy-constrains.txt new file mode 100644 index 00000000000..8851ed501b1 --- /dev/null +++ b/src/mypy-constrains.txt @@ -0,0 +1,19 @@ +# let's avoid getting new versions of those packages by accident. +# Unfortunately this means we have to manually update those +# packages regularly. + +mypy==0.901 + +# global +types-python-dateutil==0.1.3 +types-requests==0.1.11 +types-jwt==0.1.3 +types-PyYAML==5.4.0 + +# src/pybind +types-backports==0.1.2 + +# qa/ +types-boto==0.1.0 +types-cryptography==0.1.1 +types-paramiko==0.1.3 diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini index d85ab66a276..3181b6e97cb 100644 --- a/src/pybind/mgr/tox.ini +++ b/src/pybind/mgr/tox.ini @@ -58,7 +58,8 @@ basepython = python3 deps = cython -rrequirements.txt - mypy==0.901 + -c{toxinidir}/../../mypy-constrains.txt + mypy types-backports types-python-dateutil types-requests diff --git a/src/pybind/tox.ini b/src/pybind/tox.ini index 9f06a78b40b..f5b778f65b2 100644 --- a/src/pybind/tox.ini +++ b/src/pybind/tox.ini @@ -7,7 +7,9 @@ skipsdist = true [testenv] [testenv:mypy] -deps = mypy +deps = + mypy + -c{toxinidir}/../mypy-constrains.txt commands = python -m mypy --config-file ../mypy.ini \ -m ceph_daemon \ diff --git a/src/python-common/requirements.txt b/src/python-common/requirements.txt index c30b8014704..88b47310d67 100644 --- a/src/python-common/requirements.txt +++ b/src/python-common/requirements.txt @@ -1,8 +1,8 @@ pytest >=2.1.3,<5; python_version < '3.5' mock; python_version < '3.3' -mypy==0.901; python_version >= '3' +mypy; python_version >= '3' pytest-mypy; python_version >= '3' pytest >= 2.1.3; python_version >= '3' pyyaml typing-extensions; python_version < '3.8' -types-PyYAML \ No newline at end of file +types-PyYAML diff --git a/src/python-common/tox.ini b/src/python-common/tox.ini index ce54d5a625f..32160a6383b 100644 --- a/src/python-common/tox.ini +++ b/src/python-common/tox.ini @@ -5,6 +5,7 @@ skip_missing_interpreters = true [testenv:py3] deps= -rrequirements.txt + -c{toxinidir}/../mypy-constrains.txt commands= pytest --doctest-modules ceph/deployment/service_spec.py pytest {posargs} -- 2.39.5