Sync requirements with global requirements

Sync requirements with global requirements, remove oslosphinx since it's
not used. Remove docutils since it's not needed with better Sphinx
requirements.

Change-Id: Ia321147d2ece7c9a8d13665c8b8bdba9c185541f
This commit is contained in:
Andreas Jaeger 2015-04-21 07:33:19 +02:00
parent 4c179c5864
commit 0b4ecc32fb
2 changed files with 3 additions and 6 deletions

View File

@ -37,7 +37,6 @@ extensions = [
'sphinxcontrib.nwdiag',
'sphinx.ext.graphviz',
'sphinx.ext.todo'
# 'oslosphinx',
]
# Add any paths that contain templates here, relative to this directory.

View File

@ -1,13 +1,11 @@
# 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.
pbr>=0.6,!=0.7,<1.0
openstack-doc-tools>=0.23
Pygments
docutils<=0.9.1
sphinx>=1.1.2,<1.2
pbr>=0.6,!=0.7,<1.0
oslosphinx
openstackdocstheme
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
openstackdocstheme>=1.0.7
nwdiag
blockdiag
sphinxcontrib-blockdiag