From 93582756d4098d3caf328385d0a96b463b025a0e Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Tue, 4 Sep 2018 15:05:23 -0400
Subject: [PATCH] move sphinx flags to tox.ini

Use sphinx-build directly instead of relying on pbr's integration.

Change-Id: I3ed1c9f3507769d784103a4e087ec1bbb73ce532
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 setup.cfg | 9 ---------
 tox.ini   | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 2646fd0..fa2f12c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,15 +33,6 @@ sphinx =
   sphinx>=1.5.1,!=1.6.1  # BSD
   docutils>=0.11  # OSI-Approved Open Source, Public Domain
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = reno/locale
 domain = reno
diff --git a/tox.ini b/tox.ini
index 920da36..2f8a3e1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -36,7 +36,7 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 basepython = python3
-commands = python setup.py build_sphinx
+commands = sphinx-build -a -W -E -b html doc/source doc/build/html
 
 [testenv:debug]
 basepython = python3