openstack
/
heat
Code Issues Proposed changes

Switch over to oslosphinx 

oslosphinx is now available as a replacement for oslo.sphinx that
won't conflict with oslo.config in virtual envs

Change-Id: I7dc3349c8102cc8f358de7e0088128b6705c5f8e
Closes-Bug: #1277168
This commit is contained in:
Dirk Mueller 2014-02-13 18:44:59 +01:00
parent 8c4adee13f
commit e53f7792ad
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/README.rst
View File

@ -7,12 +7,12 @@ For user and admin docs, go to the directory `doc/docbkx`.
Dependencies Dependencies
============ ============
You'll need to install python *Sphinx* package and *oslo.sphinx* You'll need to install python *Sphinx* package and *oslosphinx*
package: package:
:: ::
sudo pip install sphinx oslo.sphinx sudo pip install sphinx oslosphinx
If you are using the virtualenv you'll need to install them in the If you are using the virtualenv you'll need to install them in the
virtualenv. virtualenv.

2
doc/source/conf.py
View File

@ -168,7 +168,7 @@ extensions = ['sphinx.ext.autodoc',
'sphinx.ext.pngmath', 'sphinx.ext.pngmath',
'sphinx.ext.viewcode', 'sphinx.ext.viewcode',
'sphinx.ext.doctest', 'sphinx.ext.doctest',
'oslo.sphinx', 'oslosphinx',
'ext.resources'] 'ext.resources']
todo_include_todos = True todo_include_todos = True

2
test-requirements.txt
View File

@ -10,5 +10,5 @@ testrepository>=0.0.17
testscenarios>=0.4 testscenarios>=0.4
python-glanceclient>=0.9.0 python-glanceclient>=0.9.0
sphinx>=1.1.2,<1.2 sphinx>=1.1.2,<1.2
oslo.sphinx oslosphinx
lockfile>=0.8 lockfile>=0.8