]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: track dependency in tox.ini
authorKefu Chai <kchai@redhat.com>
Sun, 2 Aug 2020 01:31:01 +0000 (09:31 +0800)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 4 Aug 2020 14:21:44 +0000 (16:21 +0200)
* 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 <kchai@redhat.com>
(cherry picked from commit a196672b77bf5f1806e0c1c8b906052cf45a6afe)

src/pybind/mgr/requirements-fix.txt [deleted file]
src/pybind/mgr/tox.ini

diff --git a/src/pybind/mgr/requirements-fix.txt b/src/pybind/mgr/requirements-fix.txt
deleted file mode 100644 (file)
index caaefd7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-autopep8; python_version >= '3'
index d197a72fd4d11a92096b5b0bdc9bba4fdec69736..8c828328f3fba02e583fbca31a249db4d90b8701 100644 (file)
@@ -68,7 +68,8 @@ commands = {[testenv]commands}
 
 [testenv:fix]
 basepython = python3
-deps = -rrequirements-fix.txt
+deps =
+    autopep8
 commands =
     python --version
     autopep8 {[autopep8]addopts} {posargs: \