From 1dcd1f83d265bfeeda7c99a3c0bb1a170d27e291 Mon Sep 17 00:00:00 2001
From: Nguyen Hai <nguyentrihai93@gmail.com>
Date: Wed, 21 Mar 2018 00:40:20 +0900
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
http://lists.openstack.org/pipermail/openstack-dev/2017-December/125710.html
http://lists.openstack.org/pipermail/openstack-dev/2018-March/128594.html

Depends-On: https://review.openstack.org/#/c/559315/
Depends-On: https://review.openstack.org/#/c/559332/

Change-Id: Icbdc67dab1853162b1a877891195cc26b4873cb0
---
 doc/requirements.txt  | 6 ++++++
 setup.cfg             | 6 ------
 test-requirements.txt | 3 ---
 tox.ini               | 2 ++
 4 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 doc/requirements.txt

diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 000000000..d959d4431
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,6 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+openstackdocstheme>=1.18.1 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
diff --git a/setup.cfg b/setup.cfg
index 67a2a35e4..41857c7a6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -452,12 +452,6 @@ neutron.cli.v2 =
     vpn-ikepolicy-update = neutronclient.neutron.v2_0.vpn.ikepolicy:UpdateIKEPolicy
     vpn-ikepolicy-delete = neutronclient.neutron.v2_0.vpn.ikepolicy:DeleteIKEPolicy
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
 [wheel]
 universal = 1
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 98ded3e94..58c378ae7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,14 +7,11 @@ coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 flake8-import-order==0.12 # LGPLv3
 mock>=2.0.0 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 osprofiler>=1.4.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-reno>=2.5.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index d11d3b96e..2d3cd408d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,9 +47,11 @@ commands =
   coverage report
 
 [testenv:docs]
+deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
+deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]