From c926216a9bd64d5cdd9731bd34e03613940d32e9 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Fri, 7 Feb 2014 23:38:39 +0000 Subject: [PATCH] Replace oslo.sphinx with oslosphinx oslosphinx is now available as a replacement for oslo.sphinx that won't conflict with oslo.config in virtual envs. Change-Id: I7c116f816af895261e76af385ee3e9288e6fa70f Closes-Bug: #1277168 --- doc/README.rst | 2 +- doc/source/conf.py | 2 +- test-requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/README.rst b/doc/README.rst index 92db83b49b67..dbaaa40b3ea2 100644 --- a/doc/README.rst +++ b/doc/README.rst @@ -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 created by starting with one that is suitable for running Nova (such as the one created by DevStack) and then using pip to install -oslo.sphinx. +oslosphinx. Building the docs ----------------- diff --git a/doc/source/conf.py b/doc/source/conf.py index 95126b67e0b0..0ae450f4f22a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -34,7 +34,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig', 'sphinx.ext.graphviz', - 'oslo.sphinx', + 'oslosphinx', ] todo_include_todos = True diff --git a/test-requirements.txt b/test-requirements.txt index 32b0af2fbaca..76854a6f5f6e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,6 +10,6 @@ psycopg2 pylint==0.25.2 python-subunit sphinx>=1.1.2,<1.2 -oslo.sphinx +oslosphinx testrepository>=0.0.17 testtools>=0.9.32