Merge "fix tox python3 overrides"
This commit is contained in:
commit
212deb53c0
6
tox.ini
6
tox.ini
|
@ -4,7 +4,6 @@ minversion = 2.3
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
basepython = python3
|
|
||||||
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
OS_STDOUT_CAPTURE=1
|
OS_STDOUT_CAPTURE=1
|
||||||
|
@ -14,7 +13,7 @@ deps = -r{toxinidir}/test-requirements.txt
|
||||||
whitelist_externals = reno
|
whitelist_externals = reno
|
||||||
|
|
||||||
[testenv:linters]
|
[testenv:linters]
|
||||||
basepython=python2.7
|
basepython = python2.7
|
||||||
deps = {[testenv]deps}
|
deps = {[testenv]deps}
|
||||||
eventlet
|
eventlet
|
||||||
httplib2
|
httplib2
|
||||||
|
@ -121,6 +120,7 @@ enable-extensions = H203
|
||||||
max-line-length = 110
|
max-line-length = 110
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
|
basepython = python3
|
||||||
usedevelop = False
|
usedevelop = False
|
||||||
skip_install = True
|
skip_install = True
|
||||||
deps =
|
deps =
|
||||||
|
@ -131,6 +131,7 @@ commands =
|
||||||
flake8
|
flake8
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
|
basepython = python3
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
|
@ -150,6 +151,7 @@ commands =
|
||||||
whitelist_externals = rm
|
whitelist_externals = rm
|
||||||
|
|
||||||
[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
|
||||||
|
|
Loading…
Reference in New Issue