Merge "fix tox python3 overrides"

This commit is contained in:
Zuul 2018-10-15 14:41:13 +00:00 committed by Gerrit Code Review
commit e4c03878fb

View File

@ -4,7 +4,6 @@ minversion = 2.3
skipsdist = True skipsdist = True
[testenv] [testenv]
basepython = python3
install_command = pip install -U {opts} {packages} install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
OS_STDOUT_CAPTURE=1 OS_STDOUT_CAPTURE=1
@ -13,6 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/test-requirements.txt
[testenv:linters] [testenv:linters]
basepython = python3
whitelist_externals = bash whitelist_externals = bash
#bashate ignore #bashate ignore
#E006 Line too long #E006 Line too long
@ -100,6 +100,7 @@ ignore = E101,E121,E123,E124,E125,E126,E127,E128,E201,E202,E203,E211,E221,E222,E
F401,F841 F401,F841
[testenv:pep8] [testenv:pep8]
basepython = python3
usedevelop = False usedevelop = False
skip_install = True skip_install = True
deps = deps =
@ -110,6 +111,7 @@ commands =
flake8 flake8
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:docs] [testenv:docs]
@ -131,6 +133,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