Skip to content

Commit

Permalink
Switch over to oslosphinx
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dirkmueller committed Feb 13, 2014
1 parent 8c4adee commit e53f779
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions doc/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ For user and admin docs, go to the directory `doc/docbkx`.
Dependencies
============

You'll need to install python *Sphinx* package and *oslo.sphinx*
You'll need to install python *Sphinx* package and *oslosphinx*
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
virtualenv.
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def find_autodoc_modules(module_name, sourcedir):
'sphinx.ext.pngmath',
'sphinx.ext.viewcode',
'sphinx.ext.doctest',
'oslo.sphinx',
'oslosphinx',
'ext.resources']

todo_include_todos = True
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ testrepository>=0.0.17
testscenarios>=0.4
python-glanceclient>=0.9.0
sphinx>=1.1.2,<1.2
oslo.sphinx
oslosphinx
lockfile>=0.8

0 comments on commit e53f779

Please sign in to comment.