summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyen Van Trung <trungnv@vn.fujitsu.com>2018-05-31 09:30:43 +0700
committerNguyen Van Trung <trungnv@vn.fujitsu.com>2018-07-10 16:33:42 +0000
commit460a8f6be31972e3c5372d0df0e1e0316189718f (patch)
tree195b3c197de54a6cf4807355cd9fe4145f03e97e
parent2e3e7339c7cb1319b384b2c7686d0389ada70870 (diff)
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: I3eb92c968ece3c15eeae59bb6ef9492f3d03eeed
Notes
Notes (review): Code-Review+2: Julia Kreger <juliaashleykreger@gmail.com> Code-Review+2: yolanda.robla <yroblamo@redhat.com> Workflow+1: yolanda.robla <yroblamo@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 11 Jul 2018 14:25:11 +0000 Reviewed-on: https://review.openstack.org/571360 Project: openstack/bifrost Branch: refs/heads/master
-rw-r--r--doc/requirements.txt6
-rw-r--r--setup.cfg9
-rw-r--r--test-requirements.txt3
-rw-r--r--tox.ini9
4 files changed, 14 insertions, 13 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..86fc0cb
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,6 @@
1sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
2sphinxcontrib-httpdomain>=1.3.0 # BSD
3sphinxcontrib-blockdiag>=1.5.4 # BSD
4reno>=2.5.0 # Apache-2.0
5os-api-ref>=1.4.0 # Apache-2.0
6openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index e2f92cc..d0b817b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,15 +26,6 @@ console_scripts =
26 bifrost_inventory.py = bifrost.inventory:main 26 bifrost_inventory.py = bifrost.inventory:main
27 bifrost_inventory = bifrost.inventory:main 27 bifrost_inventory = bifrost.inventory:main
28 28
29[build_sphinx]
30source-dir = doc/source
31build-dir = doc/build
32all_files = 1
33warning-is-error = 1
34
35[upload_sphinx]
36upload-dir = doc/build/html
37
38[compile_catalog] 29[compile_catalog]
39directory = bifrost/locale 30directory = bifrost/locale
40domain = bifrost 31domain = bifrost
diff --git a/test-requirements.txt b/test-requirements.txt
index 93c1cef..c41056c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,9 +6,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
6 6
7coverage!=4.4,>=4.0 # Apache-2.0 7coverage!=4.4,>=4.0 # Apache-2.0
8doc8>=0.6.0 # Apache-2.0 8doc8>=0.6.0 # Apache-2.0
9reno>=2.5.0 # Apache-2.0
10sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD
11openstackdocstheme>=1.18.1 # Apache-2.0
12oslotest>=3.2.0 # Apache-2.0 9oslotest>=3.2.0 # Apache-2.0
13testrepository>=0.0.18 # Apache-2.0/BSD 10testrepository>=0.0.18 # Apache-2.0/BSD
14testscenarios>=0.4 # Apache-2.0/BSD 11testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 23d8562..2c4978e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,6 +20,9 @@ commands = flake8
20 20
21[testenv:venv] 21[testenv:venv]
22basepython = python3 22basepython = python3
23deps =
24 -r{toxinidir}/test-requirements.txt
25 -r{toxinidir}/doc/requirements.txt
23commands = {posargs} 26commands = {posargs}
24 27
25[testenv:cover] 28[testenv:cover]
@@ -28,7 +31,11 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
28 31
29[testenv:docs] 32[testenv:docs]
30basepython = python3 33basepython = python3
31commands = python setup.py build_sphinx 34deps =
35 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
36 -r{toxinidir}/requirements.txt
37 -r{toxinidir}/doc/requirements.txt
38commands = sphinx-build -W -b html doc/source doc/build/html
32 39
33[testenv:debug] 40[testenv:debug]
34basepython = python3 41basepython = python3