Merge "Leverage ignore_basepython_conflict to get the right python version"

This commit is contained in:
Zuul 2018-10-18 20:56:08 +00:00 committed by Gerrit Code Review
commit cdaf63aedb

14
tox.ini
View File

@ -1,7 +1,8 @@
[tox] [tox]
minversion = 1.6 minversion = 3.1.0
skipsdist = True skipsdist = True
envlist = validate,py27,pep8,pip-install envlist = validate,py27,pep8,pip-install
ignore_basepython_conflict=true
[testenv] [testenv]
basepython = python3 basepython = python3
@ -58,7 +59,6 @@ deps =
hacking>=1.0.0 hacking>=1.0.0
bashate>=0.5.1 bashate>=0.5.1
whitelist_externals = bash whitelist_externals = bash
basepython = python3
commands = commands =
flake8 flake8
bash -c "find {toxinidir}/tools \ bash -c "find {toxinidir}/tools \
@ -86,17 +86,7 @@ deps = .
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
commands = python {toxinidir}/tools/check-install.py commands = python {toxinidir}/tools/check-install.py
[testenv:py34]
basepython = python3.4
[testenv:py35]
basepython = python3.5
[testenv:py36]
basepython = python3.6
[testenv:requirements-check] [testenv:requirements-check]
basepython = python3
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
commands = commands =
{toxinidir}/playbooks/files/project-requirements-change.py --local {posargs} {toxinidir}/playbooks/files/project-requirements-change.py --local {posargs}