From: Thomas Bechtold <tbechtold@suse.com>
Date: Mon, 16 Mar 2020 09:12:55 +0000 (+0100)
Subject: ceph-detect-init & ceph-disk: Pin testtools test requirement
X-Git-Tag: v13.2.9~16^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9670dd583b4c68e7abf45b240207aed127a86c84;p=ceph.git

ceph-detect-init & ceph-disk: Pin testtools test requirement

When running make-check on python 3.4, the test requirements
installation fails with:

ERROR: testtools requires Python '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, \
  !=3.3.*, !=3.4.*' but the running Python is 3.4.6

This happens because there is a new testtols release on pypi from Mar
14, 2020. Pinning to an older version fixes this.

This is not needed for Master, Octopus and Nautilus  given that python
3.4 is already EOL[1] before Nautilus got released.

[1] https://www.python.org/downloads/release/python-3410/

Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
---

diff --git a/src/ceph-detect-init/test-requirements.txt b/src/ceph-detect-init/test-requirements.txt
index dfbe9aeaf7f..8ba0acea354 100644
--- a/src/ceph-detect-init/test-requirements.txt
+++ b/src/ceph-detect-init/test-requirements.txt
@@ -3,7 +3,7 @@ discover
 fixtures>=0.3.14
 python-subunit
 testrepository>=0.0.17
-testtools>=0.9.32
+testtools>=0.9.32,<=2.3.0
 mock
 pytest
 tox
diff --git a/src/ceph-disk/test-requirements.txt b/src/ceph-disk/test-requirements.txt
index d803f4cfd02..6a390b38d80 100644
--- a/src/ceph-disk/test-requirements.txt
+++ b/src/ceph-disk/test-requirements.txt
@@ -4,7 +4,7 @@ discover
 fixtures>=0.3.14
 python-subunit
 testrepository>=0.0.17
-testtools>=0.9.32
+testtools>=0.9.32,<=2.3.0
 mock
 pytest
 tox>=2.0