Fix docs generation

Also add docs environment to tox.ini to simplify local docs generation Change-Id: Ie0444264e4e02d206ded2c7568d58a26cfec3ae2
2014-08-16 00:15:34 +04:00 · 2014-08-16 00:15:34 +04:00 · 37b90eda3e
parent 1761de8f02
commit 37b90eda3e
5 changed files with 14 additions and 4 deletions
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@ -14,4 +14,4 @@ Pull requests submitted through GitHub will be ignored.

 Bugs should be filed on Launchpad, not GitHub:

-   https://bugs.launchpad.net/oslo.concurrency
+   https://bugs.launchpad.net/oslo
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@ -1 +1,5 @@
-.. include:: ../../CONTRIBUTING.rst
+==============
+ Contributing
+==============
+
+.. include:: ../../CONTRIBUTING.rst
--- a/doc/source/readme.rst
+++ b/doc/source/readme.rst
@ -1 +1 @@
-.. include:: ../README.rst
+.. include:: ../../README.rst
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -1,3 +1,6 @@
 hacking>=0.9.1,<0.10
-oslosphinx
 oslotest
+
+# These are needed for docs generation
+oslosphinx
+sphinx>=1.1.2,!=1.2.0,<1.3
--- a/tox.ini
+++ b/tox.ini
@ -29,6 +29,9 @@ commands = flake8
 [testenv:venv]
 commands = {posargs}

+[testenv:docs]
+commands = python setup.py build_sphinx
+
 [testenv:cover]
 commands = python setup.py testr --coverage --testr-args='{posargs}'