From 52cb1e7825e2a332b50d0c6778749805965f0b6a Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 23 Jan 2018 09:35:42 -0600
Subject: [PATCH] Update docs to use sphinx-build

Update the tox.ini helper env 'docs' to use sphinx-build directly like
the job does.

Use the build-sphinx-docs job rather than the openstack version as we do
not need constraints in zuul.

This does not move doc requirements to doc/requirements.txt because the
Zuul docs document the tests too, so the doc build needs all the things
in test-requirements as well.

Change-Id: Id81c05725d4dbe12dccc0272c396c92ff2f475ec
---
 .zuul.yaml | 4 ++--
 tox.ini    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index c820c8e9c2..8e69ec565f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -32,7 +32,7 @@
     name: openstack-infra/zuul
     check:
       jobs:
-        - build-openstack-sphinx-docs:
+        - build-sphinx-docs:
             irrelevant-files:
               - zuul/cmd/migrate.py
               - playbooks/zuul-migrate/.*
@@ -46,7 +46,7 @@
         - zuul-stream-functional
     gate:
       jobs:
-        - build-openstack-sphinx-docs:
+        - build-sphinx-docs:
             irrelevant-files:
               - zuul/cmd/migrate.py
               - playbooks/zuul-migrate/.*
diff --git a/tox.ini b/tox.ini
index 5efc4c0fb6..5326ba4914 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,8 @@ commands =
   python setup.py test --coverage
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands =
+  sphinx-build -W -d doc/build/doctrees -b html doc/source/ doc/build/html
 
 [testenv:venv]
 commands = {posargs}