openstack/requirements
Code Issues Proposed changes

Update sphinx requirement

Browse Source 
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
This commit is contained in:
Flavio Percoco 2017-01-11 09:28:02 +01:00 committed by Michael Carden
parent e878e2b0c2
commit 4d8824708b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
global-requirements.txt
View File

@ -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 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 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 # 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 # indirectly and we needed to blacklist 0.13.1 for problems with
# when we have better constraints coverage # Sphinx 1.3. This can be now removed once all projects removed it.
docutils>=0.11,!=0.13.1 # OSI-Approved Open Source, Public Domain docutils>=0.11 # OSI-Approved Open Source, Public Domain
dogpile.cache>=0.6.2 # BSD dogpile.cache>=0.6.2 # BSD
dogtag-pki>=10.3.5.1 # LGPLv3+ dogtag-pki>=10.3.5.1 # LGPLv3+
dulwich>=0.15.0 # Apache-2.0 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 # NOT set an upper bound on setuptools, as that will lead to uninstallable
# situations as progressive releases of projects are done. # situations as progressive releases of projects are done.
setuptools>=16.0,!=24.0.0 # PSF/ZPL 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 sphinx-testing # BSD License
sphinxcontrib-blockdiag # BSD sphinxcontrib-blockdiag # BSD
sphinxcontrib-httpdomain # BSD sphinxcontrib-httpdomain # BSD

3
test-requirements.txt
View File

@ -12,6 +12,5 @@ setuptools!=24.0.0,>=16.0 # PSF/ZPL
mock>=2.0 # BSD mock>=2.0 # BSD
# this is required for the docs build jobs # this is required for the docs build jobs
docutils!=0.13.1,>=0.11 # OSI-Approved Open Source, Public Domain sphinx>=1.5.1 # BSD
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
oslosphinx>=4.7.0 # Apache-2.0 oslosphinx>=4.7.0 # Apache-2.0