From e814b66b12bb90534bb371cef1bf6972c7d54cae Mon Sep 17 00:00:00 2001 From: 98k <18552437190@163.com> Date: Fri, 5 Oct 2018 10:32:24 +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: Ib5574149623a8dd92dae34d1ec1cdd9999f31609 --- tox.ini | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 2d40d31625..4e33c1e728 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ minversion = 2.3 skipsdist = True [testenv] -basepython = python3 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_STDOUT_CAPTURE=1 @@ -14,6 +13,7 @@ deps = -r{toxinidir}/test-requirements.txt whitelist_externals = reno [testenv:linters] +basepython = python3 whitelist_externals = bash commands = bash -c "find {toxinidir} \ @@ -32,6 +32,7 @@ commands = -c {toxinidir}/.yamllint" [testenv:pep8] +basepython = python3 usedevelop = False skip_install = True deps = @@ -40,12 +41,15 @@ commands = pep8 [testenv:venv] +basepython = python3 commands = {posargs} [testenv:flake8] +basepython = python3 description = Dummy environment to allow flake8 to be run in subdir tox [testenv:pylint] +basepython = python3 description = Dummy environment to allow pylint to be run in subdir tox [testenv:api-ref] @@ -73,6 +77,7 @@ commands = whitelist_externals = rm [testenv:newnote] +basepython = python3 # Re-use the releasenotes venv envdir = {toxworkdir}/releasenotes deps = -r{toxinidir}/doc/requirements.txt