summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author98k <18552437190@163.com>2018-10-05 10:51:58 +0000
committer98k <18552437190@163.com>2018-10-05 10:52:11 +0000
commit45f04a255967a3850710e48a20241768789efbe6 (patch)
tree4e9b0f43e0c214f78ba7a611ecea795b3ce61134
parent104f305348a62d87d97e2b9e971434b03717f584 (diff)
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: I6decdccb4950b5fea18bf4613cfb0755a51d5f12
Notes
Notes (review): Code-Review+2: Al Bailey <al.bailey@windriver.com> Code-Review+1: Vieri <15050873171@163.com> Code-Review+2: Scott Little <scott.little@windriver.com> Workflow+1: Scott Little <scott.little@windriver.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 15 Oct 2018 14:51:02 +0000 Reviewed-on: https://review.openstack.org/608222 Project: openstack/stx-manifest Branch: refs/heads/master
-rw-r--r--tox.ini4
1 files changed, 3 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 5e4562d..4af12e7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@ minversion = 2.3
4skipsdist = True 4skipsdist = True
5 5
6[testenv] 6[testenv]
7basepython = python3
8install_command = pip install -U {opts} {packages} 7install_command = pip install -U {opts} {packages}
9setenv = VIRTUAL_ENV={envdir} 8setenv = VIRTUAL_ENV={envdir}
10 OS_STDOUT_CAPTURE=1 9 OS_STDOUT_CAPTURE=1
@@ -13,6 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
13deps = -r{toxinidir}/test-requirements.txt 12deps = -r{toxinidir}/test-requirements.txt
14 13
15[testenv:linters] 14[testenv:linters]
15basepython = python3
16whitelist_externals = bash 16whitelist_externals = bash
17commands = 17commands =
18 bash -c "find {toxinidir} \ 18 bash -c "find {toxinidir} \
@@ -24,9 +24,11 @@ commands =
24 -print0 | xargs -0 xmllint --noout" 24 -print0 | xargs -0 xmllint --noout"
25 25
26[testenv:venv] 26[testenv:venv]
27basepython = python3
27commands = {posargs} 28commands = {posargs}
28 29
29[testenv:true] 30[testenv:true]
31basepython = python3
30# Use same environment directory as venv to save space and install time 32# Use same environment directory as venv to save space and install time
31envdir = {toxworkdir}/venv 33envdir = {toxworkdir}/venv
32commands = true 34commands = true