Sync with global-requirements

We currently have a pending conflict over the Sphinx version in g-r,
so sync with g-r manually. Overall I would suggest that this project
should follow g-r

Change-Id: I0bf1af38945ba3e52098a925ea31f6f1dc3f3fbd
This commit is contained in:
Dirk Mueller 2016-09-29 09:21:02 +02:00
parent b494f29f3e
commit 533589ccd0
3 changed files with 11 additions and 13 deletions

View File

@ -2,8 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=1.6
PyYAML>=3.1.0
docutils
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
openstackdocstheme>=1.4.0 # Apache-2.0
pbr>=1.6 # Apache-2.0
PyYAML>=3.1.0 # MIT
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
openstackdocstheme>=1.5.0 # Apache-2.0

View File

@ -25,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
setup_requires=['pbr'],
setup_requires=['pbr>=1.8'],
pbr=True)

View File

@ -4,11 +4,10 @@
hacking<0.11,>=0.10.0
coverage>=3.6
python-subunit>=0.0.18
oslosphinx>=2.5.0 # Apache-2.0
testrepository>=0.0.18
testtools>=1.4.0
coverage>=3.6 # Apache-2.0
python-subunit>=0.0.18 # Apache-2.0/BSD
oslosphinx>=4.7.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
sphinx-testing
beautifulsoup4
beautifulsoup4 # MIT