Merge "Sync requirements with global requirements"

This commit is contained in:
Jenkins 2015-04-23 18:33:42 +00:00 committed by Gerrit Code Review
commit 0bfbbecd57
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,14 +1,12 @@
# 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
doc8 # Apache-2.0
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