From: Kefu Chai Date: Sun, 2 Aug 2020 01:31:01 +0000 (+0800) Subject: mgr/cephadm: track dependency in tox.ini X-Git-Tag: v17.0.0~1571^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a196672b77bf5f1806e0c1c8b906052cf45a6afe;p=ceph.git mgr/cephadm: track dependency in tox.ini * track dependency for running tox tests with tox.ini. the fix test is not performed by "make check", so `install-deps.sh` is not responsible for preparing the autopep8 wheels. hence we can just put it in tox.ini * remove "python_version >= '3'" as we do not support python2 this change addresses a regression introduced by 7d8a3b60321da10af6f4557a9d69eda09ca2c620, which fails the rpmbuild like: RPM build errors: Installed (but unpackaged) file(s) found: /usr/share/ceph/mgr/requirements-fix.txt Signed-off-by: Kefu Chai --- diff --git a/src/pybind/mgr/requirements-fix.txt b/src/pybind/mgr/requirements-fix.txt deleted file mode 100644 index caaefd789ec55..0000000000000 --- a/src/pybind/mgr/requirements-fix.txt +++ /dev/null @@ -1 +0,0 @@ -autopep8; python_version >= '3' diff --git a/src/pybind/mgr/tox.ini b/src/pybind/mgr/tox.ini index b4541d7c226bc..3ceba83386bb4 100644 --- a/src/pybind/mgr/tox.ini +++ b/src/pybind/mgr/tox.ini @@ -69,7 +69,8 @@ commands = {[testenv]commands} [testenv:fix] basepython = python3 -deps = -rrequirements-fix.txt +deps = + autopep8 commands = python --version autopep8 {[autopep8]addopts} {posargs: \