From: Kefu Chai <kchai@redhat.com>
Date: Fri, 30 Aug 2019 09:38:54 +0000 (+0800)
Subject: mgr/ansible: document requirements in requirements.txt
X-Git-Tag: v15.1.0~1710^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47610049229a74a264aa958a4a181931cb7f776d;p=ceph.git

mgr/ansible: document requirements in requirements.txt

so install-deps.sh is able to collect them in wheels

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/pybind/mgr/ansible/requirements.txt b/src/pybind/mgr/ansible/requirements.txt
index 8ef288ecc14c6..11914371262ef 100644
--- a/src/pybind/mgr/ansible/requirements.txt
+++ b/src/pybind/mgr/ansible/requirements.txt
@@ -1 +1,4 @@
 tox==2.9.1
+pytest
+mock
+requests-mock
diff --git a/src/pybind/mgr/ansible/tox.ini b/src/pybind/mgr/ansible/tox.ini
index 1df28401be79e..c4d96b914ff20 100644
--- a/src/pybind/mgr/ansible/tox.ini
+++ b/src/pybind/mgr/ansible/tox.ini
@@ -1,18 +1,15 @@
 [tox]
-envlist = py27,py3
+envlist = py{27,3}
 skipsdist = true
 toxworkdir = {env:CEPH_BUILD_DIR}/ansible
 minversion = 2.8.1
 
 [testenv]
 deps =
-    pytest
-    mock
-    requests-mock
+    -rrequirements.txt
 setenv=
     UNITTEST = true
     py27: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.2
     py3:  PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
-
 commands=
     {envbindir}/py.test tests/