From e53f7792ad6156ad7b16a613dd86a477d5d537e3 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 13 Feb 2014 18:44:59 +0100 Subject: [PATCH] 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 --- doc/README.rst | 4 ++-- doc/source/conf.py | 2 +- test-requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/README.rst b/doc/README.rst index 303f1b483..6828e7504 100644 --- a/doc/README.rst +++ b/doc/README.rst @@ -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. diff --git a/doc/source/conf.py b/doc/source/conf.py index deae372e8..ad49b3040 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -168,7 +168,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.pngmath', 'sphinx.ext.viewcode', 'sphinx.ext.doctest', - 'oslo.sphinx', + 'oslosphinx', 'ext.resources'] todo_include_todos = True diff --git a/test-requirements.txt b/test-requirements.txt index 81096c393..1d59dfe87 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -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