summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElod Illes <elod.illes@ericsson.com>2019-05-10 13:47:28 +0200
committerElod Illes <elod.illes@ericsson.com>2019-05-10 14:45:15 +0200
commitb4ea5fcae09fa4e6e0548f74299f19dc7017edac (patch)
tree98c44187a027ee78fd64d0a1c1dc1b66e6b42c3d
parent6582e8e4e20c511acab9e16cfd3c0f8e569f705a (diff)
downloadceilometer-b4ea5fcae09fa4e6e0548f74299f19dc7017edac.tar.gz
[stable-only] Fix sphinx requirement
Sphinx 2.0.0 dropped python 2.7 and 3.4 support. Ceilometer use global upper-constraints.txt only from Train, before that there isn't any upper constraint for the packages and job openstack-tox-py27 tries to install Sphinx 2.0.1 and fails [1] with: Downloading http://mirror.dfw.rax.openstack.org/wheel/ubuntu-16.04-x86_64/sphinx/Sphinx-2.0.1-py2.py3-none-any.whl (3.2MB) ERROR: Sphinx requires Python '>=3.5' but the running Python is 2.7.12 Conflicts: test-requirements.txt Note(elod.illes): conflict caused by not having patch I9e8b79d7a18cd36946daff10abb1a2f43b1aa3a1 in stable/queens. [1] http://logs.openstack.org/periodic-stable/opendev.org/openstack/ceilometer/stable/rocky/openstack-tox-py27/b47132e/job-output.txt.gz#_2019-05-10_06_26_02_016271 Change-Id: I4ad330dce974236be90259cd6e9f48585ff44816 (cherry picked from commit e47d366fbba74150e1e39785bb1f4a7a5d2011ea)
-rw-r--r--test-requirements.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index aeda4d70..d2b817d0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,7 +13,7 @@ reno>=1.6.2 # Apache2
oslotest>=2.15.0 # Apache-2.0
oslo.vmware>=1.16.0 # Apache-2.0
pyOpenSSL>=0.14 # Apache-2.0
-sphinx>=1.6.2 # BSD
+sphinx>=1.6.2,<2.0.0 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT