Merge "fix tox python3 overrides"

This commit is contained in:
Zuul 2018-10-09 14:44:28 +00:00 committed by Gerrit Code Review
commit 7113af25ef
1 changed files with 6 additions and 1 deletions

View File

@ -4,7 +4,6 @@ minversion = 2.3
skipsdist = True skipsdist = True
[testenv] [testenv]
basepython = python3
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
OS_STDOUT_CAPTURE=1 OS_STDOUT_CAPTURE=1
OS_STDERR_CAPTURE=1 OS_STDERR_CAPTURE=1
@ -15,18 +14,23 @@ commands = find {toxinidir} -type f -not -path '{toxinidir}/.tox/*' -not -path '
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:flake8] [testenv:flake8]
basepython = python3
description = Dummy environment to allow flake8 to be run in subdir tox description = Dummy environment to allow flake8 to be run in subdir tox
[testenv:pep8] [testenv:pep8]
basepython = python3
description = Dummy environment to allow pep8 to be run in subdir tox description = Dummy environment to allow pep8 to be run in subdir tox
[testenv:pylint] [testenv:pylint]
basepython = python3
description = Dummy environment to allow pylint to be run in subdir tox description = Dummy environment to allow pylint to be run in subdir tox
[testenv:linters] [testenv:linters]
basepython = python3
whitelist_externals = bash whitelist_externals = bash
commands = commands =
bash -c "find {toxinidir} \ bash -c "find {toxinidir} \
@ -54,6 +58,7 @@ whitelist_externals =
reno reno
[testenv:newnote] [testenv:newnote]
basepython = python3
# Re-use the releasenotes venv # Re-use the releasenotes venv
envdir = {toxworkdir}/releasenotes envdir = {toxworkdir}/releasenotes
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt