From b40093a7a78cd9196a8afd32021abca8357cdb1f Mon Sep 17 00:00:00 2001
From: melissaml <ma.lei@99cloud.net>
Date: Mon, 12 Mar 2018 05:05:25 +0800
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: If3d24a6539426242d156a35a876ea24107fcb8ab
---
 doc/requirements.txt  | 10 ++++++++++
 test-requirements.txt |  7 -------
 tox.ini               |  5 +++--
 3 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 doc/requirements.txt

diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..7e68e1c7
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,10 @@
+# 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.
+
+# this is required for the docs build jobs
+sphinx!=1.6.6,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
+sphinxmark>=0.1.14 # Apache-2.0
+doc8>=0.6.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 09d54c4a..2d59dc94 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,10 +7,3 @@ pyasn1!=0.2.3,>=0.1.8 # BSD
 pyOpenSSL>=16.2.0 # Apache-2.0
 requests>=2.14.2 # Apache-2.0
 ndg-httpsclient>=0.4.2;python_version<'3.0' # BSD
-
-# this is required for the docs build jobs
-sphinx!=1.6.6,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
-doc8>=0.6.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
-sphinxmark>=0.1.14 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 6119166d..592abbd6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,10 +31,11 @@ setenv =
 
 
 [testenv:docs]
+deps = -r{toxinidir}/doc/requirements.txt
 commands=
     bash -c "rm -rf doc/build"
     doc8 doc
-    python setup.py build_sphinx
+    sphinx-build -b html doc/source doc/build/html
 
 
 [doc8]
@@ -43,6 +44,7 @@ extensions = .rst
 
 
 [testenv:releasenotes]
+deps = -r{toxinidir}/doc/requirements.txt
 commands =
     sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
@@ -122,4 +124,3 @@ commands =
     {[testenv:bashate]commands}
     {[testenv:ansible-lint]commands}
     {[testenv:ansible-syntax]commands}
-    {[testenv:docs]commands}