From 2f56aba1b94e98fe8c423ff8aefbf9f99aa0ab8f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 2 Aug 2020 09:31:01 +0800 Subject: [PATCH] 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 (cherry picked from commit a196672b77bf5f1806e0c1c8b906052cf45a6afe) --- src/pybind/mgr/requirements-fix.txt | 1 - src/pybind/mgr/tox.ini | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/pybind/mgr/requirements-fix.txt diff --git a/src/pybind/mgr/requirements-fix.txt b/src/pybind/mgr/requirements-fix.txt deleted file mode 100644 index caaefd789ec5..000000000000 --- 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 d197a72fd4d1..8c828328f3fb 100644 --- a/src/pybind/mgr/tox.ini +++ b/src/pybind/mgr/tox.ini @@ -68,7 +68,8 @@ commands = {[testenv]commands} [testenv:fix] basepython = python3 -deps = -rrequirements-fix.txt +deps = + autopep8 commands = python --version autopep8 {[autopep8]addopts} {posargs: \ -- 2.47.3