summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyen Hung Phuong <phuongnh@vn.fujitsu.com>2018-07-04 14:45:41 +0700
committerNguyen Hung Phuong <phuongnh@vn.fujitsu.com>2018-07-05 11:39:35 +0700
commit08b7704802c13683ea254130dadff81800d60243 (patch)
tree66ea94883337ca6cea8112cf48933529cf5ca352
parentaccd37c0548e5445519e83126dbfdf85acd5c2da (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: If28474c5c68649785b19fd07bf9287da5f378e8e
Notes
Notes (review): Code-Review+1: Dao Cong Tien <tiendc@vn.fujitsu.com> Code-Review+2: Jean-Philippe Evrard <jean-philippe@evrard.me> Code-Review+2: Kevin Carter (cloudnull) <kevin@cloudnull.com> Workflow+1: Kevin Carter (cloudnull) <kevin@cloudnull.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 11 Jul 2018 19:48:08 +0000 Reviewed-on: https://review.openstack.org/580079 Project: openstack/openstack-ansible-repo_server Branch: refs/heads/master
-rw-r--r--tox.ini4
1 files changed, 4 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index c649a5f..18c6740 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,6 +30,7 @@ setenv =
30 30
31 31
32[testenv:docs] 32[testenv:docs]
33basepython = python3
33deps = -r{toxinidir}/doc/requirements.txt 34deps = -r{toxinidir}/doc/requirements.txt
34commands= 35commands=
35 bash -c "rm -rf doc/build" 36 bash -c "rm -rf doc/build"
@@ -43,6 +44,7 @@ extensions = .rst
43 44
44 45
45[testenv:releasenotes] 46[testenv:releasenotes]
47basepython = python3
46deps = -r{toxinidir}/doc/requirements.txt 48deps = -r{toxinidir}/doc/requirements.txt
47commands = 49commands =
48 sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html 50 sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
@@ -50,11 +52,13 @@ commands =
50 52
51# environment used by the -infra templated docs job 53# environment used by the -infra templated docs job
52[testenv:venv] 54[testenv:venv]
55basepython = python3
53commands = 56commands =
54 {posargs} 57 {posargs}
55 58
56 59
57[testenv:pep8] 60[testenv:pep8]
61basepython = python3
58commands = 62commands =
59 bash -c "{toxinidir}/tests/common/test-pep8.sh" 63 bash -c "{toxinidir}/tests/common/test-pep8.sh"
60 64