From 7274bc23f1f1b29cfabf30a66f33a1a9b1eac927 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Fri, 2 Mar 2018 09:00:54 +0800 Subject: 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: I4b1b023ff2c40f5b31429584fc1a77c0315ed2d9 Co-Authored-By: Stephen Finucane --- tox.ini | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index f13f95c..41615d4 100644 --- a/tox.ini +++ b/tox.ini @@ -6,12 +6,12 @@ envlist = py35,py27,pep8 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}/test-requirements.txt - -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/requirements.txt # We want to support both vanilla stdlib and eventlet monkey patched commands = - lockutils-wrapper stestr run --slowest {posargs} - env TEST_EVENTLET=1 lockutils-wrapper stestr run --slowest {posargs} + lockutils-wrapper stestr run --slowest {posargs} + env TEST_EVENTLET=1 lockutils-wrapper stestr run --slowest {posargs} [testenv:py27] basepython = python2.7 @@ -32,19 +32,22 @@ commands = {posargs} [testenv:docs] basepython = python3 whitelist_externals = rm +deps = + {[testenv]deps} + -r{toxinidir}/doc/requirements.txt commands = - rm -fr doc/build - sphinx-build -W -b html doc/source doc/build/html {posargs} + rm -fr doc/build + sphinx-build -W -b html doc/source doc/build/html {posargs} [testenv:cover] basepython = python3 setenv = - PYTHON=coverage run --source oslo_concurrency --parallel-mode + PYTHON=coverage run --source oslo_concurrency --parallel-mode commands = - stestr run {posargs} - coverage combine - coverage html -d cover - coverage xml -o cover/coverage.xml + stestr run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [flake8] show-source = True @@ -57,6 +60,7 @@ import_exceptions = [testenv:releasenotes] basepython = python3 +deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html [testenv:lower-constraints] -- cgit v1.2.1