From 959e7e4ea0382a00681c6f210e160fc278af26c6 Mon Sep 17 00:00:00 2001 From: 98k <18552437190@163.com> Date: Fri, 5 Oct 2018 10:49:05 +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: I98a58d37d067569ad73429ece9f49780bfe73e97 --- tox.ini | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index abf41758..77a29d1f 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} {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_STDOUT_CAPTURE=1 @@ -14,7 +13,7 @@ deps = -r{toxinidir}/test-requirements.txt whitelist_externals = reno [testenv:linters] -basepython=python2.7 +basepython = python2.7 deps = {[testenv]deps} eventlet httplib2 @@ -121,6 +120,7 @@ enable-extensions = H203 max-line-length = 110 [testenv:pep8] +basepython = python3 usedevelop = False skip_install = True deps = @@ -131,6 +131,7 @@ commands = flake8 [testenv:venv] +basepython = python3 commands = {posargs} [testenv:docs] @@ -150,6 +151,7 @@ commands = whitelist_externals = rm [testenv:newnote] +basepython = python3 # Re-use the releasenotes venv envdir = {toxworkdir}/releasenotes deps = -r{toxinidir}/doc/requirements.txt