From 1cbe9361cbbe40485fce57c1a8a7a8fde30e549b Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@huawei.com>
Date: Mon, 8 Jan 2018 12:11:54 -0600
Subject: [PATCH] Follow the new PTI for document build

For compliance with the Project Testing Interface as described in:

https://governance.openstack.org/tc/reference/project-testing-interface.html

For more detials information, please refer to:

http://lists.openstack.org/pipermail/openstack-dev/2017-December/125710.html

Change-Id: I39b9806013a0912b27c0523dfc2b713b3105bdf1
---
 setup.cfg | 9 ---------
 tox.ini   | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 51b1b7caa..f5bda4954 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -83,15 +83,6 @@ oslo.config.opts =
 [wheel]
 universal = 1
 
-[build_sphinx]
-warning-is-error = 1
-all-files = 1
-source-dir = doc/source
-build-dir = doc/build
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = oslo_messaging/locale
 domain = oslo_messaging
diff --git a/tox.ini b/tox.ini
index d772882a6..03d01c295 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,8 +28,8 @@ commands = {posargs}
 
 [testenv:docs]
 basepython = python2.7
-commands = python setup.py build_sphinx
 deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:py27-func-rabbit]
 setenv =