From 4d8824708b560bf97a63e59786496cc720a95fed Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Wed, 11 Jan 2017 09:28:02 +0100 Subject: [PATCH] Update sphinx requirement In change I38580a5f765c7bb586dcf2786e91be15a8eba235 we skipped one of the docutils versions due to a breaking release that was not supported by sphinx. This has now been fixed in the latter[0]. With Sphinx 1.5.1, the blocking of docutils 0.13.1 is not needed anymore, so remove the condition. This line could be removed completely, but for that it first needs to be removed from all projects. [0] https://github.com/sphinx-doc/sphinx/issues/3212 Change-Id: I01b7b6f3fac75e284debe211129b7b1e87c756d9 --- global-requirements.txt | 8 ++++---- test-requirements.txt | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/global-requirements.txt b/global-requirements.txt index 5cc9ffa0f7..7442736e15 100644 --- a/global-requirements.txt +++ b/global-requirements.txt @@ -39,9 +39,9 @@ django_openstack_auth>=2.4.0 # Apache-2.0 dnspython>=1.14.0;python_version=='2.7' # http://www.dnspython.org/LICENSE dnspython3>=1.12.0,!=1.13.0,!=1.14.0;python_version>='3.0' # http://www.dnspython.org/LICENSE # Note(tonyb): We don't actually directly depend on docutils but we pull it in -# indirectly and we need to blacklist 0.13.1 for $reasons. We can remove this -# when we have better constraints coverage -docutils>=0.11,!=0.13.1 # OSI-Approved Open Source, Public Domain +# indirectly and we needed to blacklist 0.13.1 for problems with +# Sphinx 1.3. This can be now removed once all projects removed it. +docutils>=0.11 # OSI-Approved Open Source, Public Domain dogpile.cache>=0.6.2 # BSD dogtag-pki>=10.3.5.1 # LGPLv3+ dulwich>=0.15.0 # Apache-2.0 @@ -373,7 +373,7 @@ selenium>=2.50.1 # Apache-2.0 # NOT set an upper bound on setuptools, as that will lead to uninstallable # situations as progressive releases of projects are done. setuptools>=16.0,!=24.0.0 # PSF/ZPL -sphinx>=1.2.1,!=1.3b1,<1.4 # BSD +sphinx>=1.5.1 # BSD sphinx-testing # BSD License sphinxcontrib-blockdiag # BSD sphinxcontrib-httpdomain # BSD diff --git a/test-requirements.txt b/test-requirements.txt index 39df4286c2..b0fae3f745 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,6 +12,5 @@ setuptools!=24.0.0,>=16.0 # PSF/ZPL mock>=2.0 # BSD # this is required for the docs build jobs -docutils!=0.13.1,>=0.11 # OSI-Approved Open Source, Public Domain -sphinx!=1.3b1,<1.4,>=1.2.1 # BSD +sphinx>=1.5.1 # BSD oslosphinx>=4.7.0 # Apache-2.0