From d92353b9853cce9a09ab054190a71ac9e03fc110 Mon Sep 17 00:00:00 2001 From: 98k <18552437190@163.com> Date: Fri, 5 Oct 2018 11:05:22 +0000 Subject: [PATCH] fix tox python3 overrides 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: I525cf90bc8a9e61b4cd682ba8e95d9e70f7f61f3 --- tox.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 5fdc441b..accfc28c 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ minversion = 2.3 skipsdist = True [testenv] -basepython = python3 install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_STDOUT_CAPTURE=1 @@ -13,6 +12,7 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/test-requirements.txt [testenv:linters] +basepython = python3 whitelist_externals = bash #bashate ignore #E006 Line too long @@ -31,6 +31,7 @@ commands = -print0 | xargs -0 yamllint" [testenv:pep8] +basepython = python3 usedevelop = False description = Run style checks. @@ -51,6 +52,7 @@ exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,release-tag-* [testenv:venv] +basepython = python3 commands = {posargs} [testenv:docs] @@ -72,6 +74,7 @@ whitelist_externals = reno [testenv:newnote] +basepython = python3 # Re-use the releasenotes venv envdir = {toxworkdir}/releasenotes deps = -r{toxinidir}/doc/requirements.txt