From 5851ac317fbd768639ab1895a30d0dc62f3a58b3 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Fri, 9 Mar 2018 10:46:39 +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: Id5641128e637c2767e1ab8758d31663eaa397c41
---
doc/requirements.txt | 10 ++++++++++
test-requirements.txt | 7 -------
tox.ini | 4 +++-
3 files changed, 13 insertions(+), 8 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 91024bd3..99f33bdb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,10 +28,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]
@@ -40,6 +41,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