Merge "Replace oslo.sphinx with oslosphinx"

This commit is contained in:
Jenkins 2014-02-14 17:34:18 +00:00 committed by Gerrit Code Review
commit 215d646177
3 changed files with 3 additions and 3 deletions

View File

@ -12,7 +12,7 @@ environment, such as the virtualenv created by ``run_tests.sh`` or
``tools/install_venv.py``. A leaner but sufficient environment can be ``tools/install_venv.py``. A leaner but sufficient environment can be
created by starting with one that is suitable for running Nova (such created by starting with one that is suitable for running Nova (such
as the one created by DevStack) and then using pip to install as the one created by DevStack) and then using pip to install
oslo.sphinx. oslosphinx.
Building the docs Building the docs
----------------- -----------------

View File

@ -34,7 +34,7 @@ extensions = ['sphinx.ext.autodoc',
'sphinx.ext.pngmath', 'sphinx.ext.pngmath',
'sphinx.ext.ifconfig', 'sphinx.ext.ifconfig',
'sphinx.ext.graphviz', 'sphinx.ext.graphviz',
'oslo.sphinx', 'oslosphinx',
] ]
todo_include_todos = True todo_include_todos = True

View File

@ -10,6 +10,6 @@ psycopg2
pylint==0.25.2 pylint==0.25.2
python-subunit python-subunit
sphinx>=1.1.2,<1.2 sphinx>=1.1.2,<1.2
oslo.sphinx oslosphinx
testrepository>=0.0.17 testrepository>=0.0.17
testtools>=0.9.32 testtools>=0.9.32