summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhuang.zhiping <huang.zhiping@99cloud.net>2018-06-09 15:23:28 +0800
committerYushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com>2018-07-25 23:53:51 +0000
commitc8932b4f818910b3bfb7e42e3b723b089dbd1cc7 (patch)
tree2109a69fb6c033c570cb8d76e751d185f68a2fdc
parent89c1742a8c6e682c27dbcd531ea002c6378c4cef (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: I6b35f4121e9742544cd8d365f46abda62454baba
Notes
Notes (review): Code-Review+2: Yushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com> Workflow+1: Yushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 26 Jul 2018 01:34:51 +0000 Reviewed-on: https://review.openstack.org/573911 Project: openstack/networking-fujitsu Branch: refs/heads/master
-rw-r--r--tox.ini6
1 files changed, 6 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index 7bef5de..d7e30d7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,12 +17,15 @@ commands = stestr run {posargs}
17passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY 17passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
18 18
19[testenv:pep8] 19[testenv:pep8]
20basepython = python3
20commands = flake8 21commands = flake8
21 22
22[testenv:venv] 23[testenv:venv]
24basepython = python3
23commands = {posargs} 25commands = {posargs}
24 26
25[testenv:cover] 27[testenv:cover]
28basepython = python3
26setenv = 29setenv =
27 {[testenv]setenv} 30 {[testenv]setenv}
28 PYTHON=coverage run --source networking_fujitsu --parallel-mode 31 PYTHON=coverage run --source networking_fujitsu --parallel-mode
@@ -34,12 +37,15 @@ commands =
34 coverage xml -o cover/coverage.xml 37 coverage xml -o cover/coverage.xml
35 38
36[testenv:docs] 39[testenv:docs]
40basepython = python3
37commands = python setup.py build_sphinx 41commands = python setup.py build_sphinx
38 42
39[testenv:releasenotes] 43[testenv:releasenotes]
44basepython = python3
40commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html 45commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
41 46
42[testenv:debug] 47[testenv:debug]
48basepython = python3
43commands = oslo_debug_helper -t networking_fujitsu/tests {posargs} 49commands = oslo_debug_helper -t networking_fujitsu/tests {posargs}
44 50
45[flake8] 51[flake8]