summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChangBo Guo(gcb) <eric.guo@easystack.cn>2017-12-19 14:47:09 +0800
committerChangBo Guo(gcb) <eric.guo@easystack.cn>2017-12-19 19:00:49 +0800
commitf0dd124daa78c1f214fa67d9504cb0d5ab1b24db (patch)
treea4624066a8c1b6ff54de5885ef7b8ad5d5710f9a
parentf9970a94e5c70c6fa453061196899cec7a8a5b40 (diff)
downloadoslo-context-f0dd124daa78c1f214fa67d9504cb0d5ab1b24db.tar.gz
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: I9d23ea7b5731fb677b2b1a09cdec74a1101dcd2c
-rw-r--r--doc/requirements.txt5
-rw-r--r--test-requirements.txt5
-rw-r--r--tox.ini8
3 files changed, 12 insertions, 6 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..1ed3e79
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,5 @@
+# These are needed for docs generation
+openstackdocstheme>=1.17.0 # Apache-2.0
+sphinx>=1.6.2 # BSD
+reno>=2.5.0 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index 6943177..73d5fef 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,10 +7,5 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
-# These are needed for docs generation
-openstackdocstheme>=1.17.0 # Apache-2.0
-sphinx>=1.6.2 # BSD
-reno>=2.5.0 # Apache-2.0
-
# Bandit security code scanner
bandit>=1.1.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d916ce6..4ebe118 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,10 @@ commands =
commands = {posargs}
[testenv:docs]
-commands = python setup.py build_sphinx
+deps =
+ -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -b html doc/source doc/build/html
[testenv:cover]
commands = python setup.py test --coverage --coverage-package-name=oslo_context --testr-args='{posargs}'
@@ -46,4 +49,7 @@ deps = pip_missing_reqs
commands = pip-missing-reqs -d --ignore-module=oslo_context* --ignore-file=oslo_context/tests/* --ignore-file=tests/ oslo_context
[testenv:releasenotes]
+deps =
+ -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+ -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html