Fix docs build to run properly

Change-Id: I7f684bc48c5ce913a5799f78c80bda459cf35f65
2014-08-11 15:12:26 -04:00 · 2014-08-11 15:12:26 -04:00 · 94bff36bdf
commit 94bff36bdf
parent d2d8f253ab
6 changed files with 19 additions and 5 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.serialization
+   https://bugs.launchpad.net/oslo
--- a/doc/source/contributing.rst
+++ b/doc/source/contributing.rst
@ -1 +1,5 @@
+==============
+ Contributing
+==============
+
 .. include:: ../../CONTRIBUTING.rst
--- a/doc/source/readme.rst
+++ b/doc/source/readme.rst
@ -1 +1 @@
-.. include:: ../README.rst
+.. include:: ../../README.rst
--- a/setup.cfg
+++ b/setup.cfg
@ -26,6 +26,9 @@ packages =
 namespace_packages =
    oslo

+[pbr]
+warnerrors = true
+
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -1,7 +1,11 @@
 hacking>=0.5.6,<0.8
 mock>=1.0
 netaddr
+
+# this is required for the docs build jobs
+sphinx>=1.1.2,!=1.2.0,<1.3
 oslosphinx
+
 oslotest
 simplejson
 oslo.i18n>=0.2.0
--- a/tox.ini
+++ b/tox.ini
@ -22,6 +22,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}'