From 128b533cce2c25a65de80d866ecccf27ef5adcc5 Mon Sep 17 00:00:00 2001 From: Elod Illes Date: Fri, 10 May 2019 13:47:28 +0200 Subject: [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 I752b36b3dfe8f935b68c4d3d59ccb5b8b60c582f 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) (cherry picked from commit b4ea5fcae09fa4e6e0548f74299f19dc7017edac) --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 4076cf5e..725908e7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,7 +15,7 @@ oslotest>=2.15.0 # Apache-2.0 oslo.vmware>=1.16.0 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD pyOpenSSL>=0.14 # Apache-2.0 -sphinx>=1.6.2 # BSD +sphinx>=1.6.2,<2.0.0 # BSD sphinxcontrib-httpdomain # BSD sphinxcontrib-pecanwsme>=0.8 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD -- cgit v1.2.1