Update sphinx requirements to match global requirements

Sphinx has released a version that is not compatible with Python 2, so
we now need separate requirements for py2 and py3.

Also removing the [docs] target from setup.cfg since that method has
been deprecated and is no longer used.

Change-Id: If006a45d8897d4a68e93180ea55f3220edb1abac
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2019-05-16 13:46:50 -05:00 committed by Victor Morales
parent e607733723
commit 25b780e3f5
3 changed files with 3 additions and 5 deletions

View File

@ -1,5 +1,6 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.3,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.3;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0

View File

@ -63,7 +63,7 @@ rfc3986==0.3.1
simplejson==3.5.1
six==1.10.0
snowballstemmer==1.2.1
Sphinx==1.6.2
Sphinx==1.6.3
sphinxcontrib-websupport==1.0.1
stevedore==1.20.0
tempest==17.1.0

View File

@ -50,9 +50,6 @@ test =
tempest>=17.1.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
doc =
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
oslosphinx>=4.7.0 # Apache-2.0
[wheel]
universal = 1