Merge "invoke sphinx directly instead of through pbr"

2016-05-10 17:03:03 +00:00 · 2016-05-10 17:03:03 +00:00 · 65e299585b
commit 65e299585b
parent 556a7f2141 97986ff795
5 changed files with 12 additions and 1 deletions
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@ -98,6 +98,7 @@ series. You can find the detail of the various release series here:
   bexar/index
   austin/index
   releases/*
+   schedules/*

 Series-Independent Releases
 ===========================
--- a/doc/source/mitaka/index.rst
+++ b/doc/source/mitaka/index.rst
@ -17,3 +17,8 @@ Documentation:

 .. deliverable::
   :series: mitaka
+
+.. toctree::
+   :hidden:
+
+   schedule
--- a/doc/source/newton/index.rst
+++ b/doc/source/newton/index.rst
@ -8,3 +8,8 @@ Release schedule: :doc:`schedule`

 .. deliverable::
   :series: newton
+
+.. toctree::
+   :hidden:
+
+   schedule
--- a/doc/source/static/.placeholder
+++ b/doc/source/static/.placeholder
--- a/tox.ini
+++ b/tox.ini
@ -53,7 +53,7 @@ commands = {toxinidir}/tools/build_tag_history.sh {toxinidir}
 #commands = python setup.py testr --coverage --testr-args='{posargs}'

 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
 deps = .[sphinxext]

 [flake8]