From 17ef71a482c02c3cf002d3b775156c5c99ded4e6 Mon Sep 17 00:00:00 2001 From: xywang <233652566@qq.com> Date: Fri, 20 Apr 2018 10:03:48 +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: I444cdaad0d83d9d8795dc03793aefe2fa3a51203 --- doc/requirements.txt | 10 ++++++++++ setup.cfg | 6 ------ test-requirements.txt | 6 ------ tox.ini | 4 +++- 4 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 000000000..23c20937d --- /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. +openstackdocstheme>=1.18.1 # Apache-2.0 +sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinxcontrib-apidoc>=0.2.0 # BSD +reno>=2.5.0 # Apache-2.0 +os-api-ref>=1.4.0 # Apache-2.0 +pymongo!=3.1,>=3.0.2 # Apache-2.0 +redis>=2.10.0 # MIT diff --git a/setup.cfg b/setup.cfg index fb4101e48..dbb4c45a6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,12 +21,6 @@ classifier = packages = zaqar -[build_sphinx] -all_files = 1 -build-dir = doc/build -source-dir = doc/source -warning-is-error = 1 - [entry_points] console_scripts = zaqar-bench = zaqar.bench.conductor:main diff --git a/test-requirements.txt b/test-requirements.txt index 14a317ff5..2534cf3b6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -26,13 +26,7 @@ testtools>=2.2.0 # MIT oslo.db>=4.27.0 # Apache-2.0 testresources>=2.0.0 # Apache-2.0/BSD os-testr>=1.0.0 # Apache-2.0 - -# Documentation -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD -openstackdocstheme>=1.18.1 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 -reno>=2.5.0 # Apache-2.0 -os-api-ref>=1.4.0 # Apache-2.0 #OSprofiler osprofiler>=1.4.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 5dfbe4bc4..b57dddf35 100644 --- a/tox.ini +++ b/tox.ini @@ -44,9 +44,11 @@ commands = commands = {posargs} [testenv:docs] +deps = + -r{toxinidir}/doc/requirements.txt + commands = doc8 doc/source - python setup.py build_sphinx sphinx-build -W -b html api-ref/source api-ref/build/html [testenv:api-ref]