openstack/zaqar
Code Issues Proposed changes

fix tox python3 overrides

Browse Source 
We want to default to running all tox environments under python 3, so
set the basepython value in each environment.

We do not want to specify a minor version number, because we do not
want to have to update the file every time we upgrade python.

We do not want to set the override once in testenv, because that
breaks the more specific versions used in default environments like
py35 and py36.

Change-Id: I98cf0911acb2f24e5d48661e20ff4a068b678754
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2018-06-06 16:06:05 -04:00 committed by Xiyuan Wang
parent 82c955ebf3
commit 45eea410ba
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tox.ini
View File

@ -18,32 +18,39 @@ commands =
whitelist_externals = find whitelist_externals = find
[testenv:integration] [testenv:integration]
basepython = python3
setenv = {[testenv]setenv} setenv = {[testenv]setenv}
ZAQAR_TEST_INTEGRATION=1 ZAQAR_TEST_INTEGRATION=1
OS_TEST_PATH=./zaqar/tests/functional OS_TEST_PATH=./zaqar/tests/functional
commands = ostestr --concurrency 1 {posargs} commands = ostestr --concurrency 1 {posargs}
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = flake8 commands = flake8
[testenv:genconfig] [testenv:genconfig]
basepython = python3
commands = commands =
oslo-config-generator --config-file etc/oslo-config-generator/zaqar.conf oslo-config-generator --config-file etc/oslo-config-generator/zaqar.conf
[testenv:genpolicy] [testenv:genpolicy]
basepython = python3
commands = commands =
oslopolicy-sample-generator --config-file etc/zaqar-policy-generator.conf oslopolicy-sample-generator --config-file etc/zaqar-policy-generator.conf
[testenv:cover] [testenv:cover]
basepython = python3
commands = commands =
python setup.py testr --coverage \ python setup.py testr --coverage \
--testr-args='^(?!.*test.*coverage).*$' --testr-args='^(?!.*test.*coverage).*$'
coverage report coverage report
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:docs] [testenv:docs]
basepython = python3
deps = deps =
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
@ -53,6 +60,7 @@ commands =
sphinx-build -W -b html api-ref/source api-ref/build/html sphinx-build -W -b html api-ref/source api-ref/build/html
[testenv:api-ref] [testenv:api-ref]
basepython = python3
# This environment is called from CI scripts to test and publish # This environment is called from CI scripts to test and publish
# the API Ref to developer.openstack.org. # the API Ref to developer.openstack.org.
# #
@ -63,9 +71,11 @@ commands =
sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
[testenv:debug] [testenv:debug]
basepython = python3
commands = oslo_debug_helper {posargs} commands = oslo_debug_helper {posargs}
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
commands = commands =
doc8 releasenotes/source releasenotes/notes doc8 releasenotes/source releasenotes/notes
sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html sphinx-build -a -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html