From 0f2c0d54b886b979ff834be18ec716712b8ece77 Mon Sep 17 00:00:00 2001 From: confi-surya Date: Wed, 4 Apr 2018 17:20:57 +0900 Subject: Following the new PTI for document build For compliance with the Project Testing Interface [1] as described in [2] [1] https://governance.openstack.org/tc/reference/project-testing-interface.html [2] http://lists.openstack.org/pipermail/openstack-dev/2017-December/125710.html Change-Id: Ic0b3f6c24b3229bbee19b39f9264a40884c700c9 --- setup.cfg | 5 ----- tox.ini | 11 ++++++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/setup.cfg b/setup.cfg index 346c2d619..381d592b7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,11 +43,6 @@ setup-hooks = [pbr] -[build_sphinx] -all_files = 1 -build-dir = doc/build -source-dir = doc/source -warning-is-error = 1 [build_releasenotes] all_files = 1 diff --git a/tox.ini b/tox.ini index 745215611..9d57db8e9 100644 --- a/tox.ini +++ b/tox.ini @@ -7,8 +7,9 @@ envlist = py35,py27,pep8,pypy usedevelop=True whitelist_externals = find rm -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} -deps = -r{toxinidir}/requirements.txt +install_command = pip install {opts} {packages} +deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE OS_TEST_TIMEOUT @@ -49,7 +50,11 @@ commands = bandit -r docker kolla tests tools commands = {posargs} [testenv:docs] -deps = -r{toxinidir}/doc/requirements.txt +deps = + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -r{toxinidir}/requirements.txt + -r{toxinidir}/doc/requirements.txt + commands = rm -rf doc/build doc8 doc -- cgit v1.2.3