From 7dd27bfc7cc243b2b93137937092d4326ac9c89e Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@huawei.com>
Date: Thu, 1 Feb 2018 16:22:21 -0600
Subject: [PATCH] Use 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: I9cf0bac7edc5f4d45af2729428f92d8a6fd7860d
---
doc/requirements.txt | 11 +++++++++++
test-requirements.txt | 4 ----
tox.ini | 4 +++-
3 files changed, 14 insertions(+), 5 deletions(-)
create mode 100644 doc/requirements.txt
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000000..079b9941d0
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,11 @@
+# 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.
+sphinx!=1.6.6,>=1.6.2 # BSD
+oslosphinx>=4.7.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
+
+fixtures>=3.0.0 # Apache-2.0/BSD
+testresources>=2.0.0 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+oslotest>=3.2.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index e0d270c7e3..4e3254e4c2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,10 +8,8 @@ fixtures>=3.0.0 # Apache-2.0/BSD
flake8-import-order==0.12 # LGPLv3
mock>=2.0.0 # BSD
-sphinx!=1.6.6,>=1.6.2 # BSD
psycopg2>=2.6.2 # LGPL/ZPL
PyMySQL>=0.7.6 # MIT License
-oslosphinx>=4.7.0 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
oslo.privsep>=1.23.0 # Apache-2.0
pyroute2>=0.4.21;sys_platform!='win32' # Apache-2.0 (+ dual licensed GPL2)
@@ -20,8 +18,6 @@ testresources>=2.0.0 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
testscenarios>=0.4 # Apache-2.0/BSD
WebTest>=2.0.27 # MIT
-# This is needed for subunit-trace
-reno>=2.5.0 # Apache-2.0
bandit>=1.1.0 # Apache-2.0
tempest>=17.1.0 # Apache-2.0
pylint==1.4.5 # GPLv2
diff --git a/tox.ini b/tox.ini
index 0b5d36389f..899030e3ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,6 +47,7 @@ commands =
sitepackages = True
[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
[testenv:py27]
@@ -82,7 +83,8 @@ commands =
commands = {posargs}
[testenv:docs]
-commands = sphinx-build -W -b html doc/source doc/build/html
+deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -b html doc/source doc/build/html
[flake8]
# E125 continuation line does not distinguish itself from next logical line