From: Kefu Chai Date: Thu, 12 Mar 2020 06:47:15 +0000 (+0800) Subject: mgr,python-common: drop modules for python2 in requirements.txt X-Git-Tag: v16.0.0~47^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7e29b0f44538cb83b97222dc4d3a783acf890a9;p=ceph.git mgr,python-common: drop modules for python2 in requirements.txt we don't support python2 anymore, so no need to install them for python2 anymore. also, this helps to silence the messages from pip like ``` Ignoring pytest: markers 'python_version < "3.5"' don't match your environment Ignoring mock: markers 'python_version < "3.3"' don't match your environment ``` Signed-off-by: Kefu Chai --- diff --git a/src/pybind/mgr/dashboard/requirements-test.txt b/src/pybind/mgr/dashboard/requirements-test.txt index 9305006176ea..e45e05a0e467 100644 --- a/src/pybind/mgr/dashboard/requirements-test.txt +++ b/src/pybind/mgr/dashboard/requirements-test.txt @@ -1,4 +1,3 @@ -mock; python_version <= '3.3' pytest<4 pytest-cov pytest-instafail diff --git a/src/pybind/mgr/requirements.txt b/src/pybind/mgr/requirements.txt index c43770d2d72e..1ac1ff3130cc 100644 --- a/src/pybind/mgr/requirements.txt +++ b/src/pybind/mgr/requirements.txt @@ -1,6 +1,4 @@ pytest-cov==2.7.1 -mock; python_version <= '3.3' -ipaddress; python_version < '3.3' -e../../python-common kubernetes requests-mock diff --git a/src/python-common/requirements.txt b/src/python-common/requirements.txt index c935efe169a0..a6cf7096dbce 100644 --- a/src/python-common/requirements.txt +++ b/src/python-common/requirements.txt @@ -1,6 +1,4 @@ six -pytest >=2.1.3,<5; python_version < '3.5' -mock; python_version < '3.3' mypy; python_version >= '3' pytest-mypy; python_version >= '3' pytest >= 2.1.3; python_version >= '3'