summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2018-06-06 14:50:06 -0400
committerDoug Hellmann <doug@doughellmann.com>2018-06-06 14:53:48 -0400
commit8b50ec329bd75c6471a5c123ca2f2eb5018465bb (patch)
tree8d2b46cb0b8cb197d288d111e928be9e26487d9e
parent6eee2a070aed8de2e3e722666d3adf8871809e3d (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: I286299b3ef10c008e73900e0d08a461637796b67 Signed-off-by: Doug Hellmann <doug@doughellmann.com>
Notes
Notes (review): Code-Review+2: Stephen Finucane <stephenfin@redhat.com> Workflow+1: Stephen Finucane <stephenfin@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 07 Jun 2018 09:16:11 +0000 Reviewed-on: https://review.openstack.org/572874 Project: openstack/mox3 Branch: refs/heads/master
-rw-r--r--tox.ini6
1 files changed, 5 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 44fa5a9..3e110d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,6 @@ minversion = 2.0
3envlist = py35,py27,pep8 3envlist = py35,py27,pep8
4 4
5[testenv] 5[testenv]
6basepython = python3
7install_command = pip install {opts} {packages} 6install_command = pip install {opts} {packages}
8deps = 7deps =
9 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} 8 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
@@ -16,15 +15,19 @@ commands =
16basepython = python2.7 15basepython = python2.7
17 16
18[testenv:docs] 17[testenv:docs]
18basepython = python3
19commands = python setup.py build_sphinx 19commands = python setup.py build_sphinx
20 20
21[testenv:pep8] 21[testenv:pep8]
22basepython = python3
22commands = flake8 23commands = flake8
23 24
24[testenv:venv] 25[testenv:venv]
26basepython = python3
25commands = {posargs} 27commands = {posargs}
26 28
27[testenv:cover] 29[testenv:cover]
30basepython = python3
28commands = 31commands =
29 python setup.py testr --coverage 32 python setup.py testr --coverage
30 33
@@ -34,6 +37,7 @@ ignore = E721
34exclude=.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg 37exclude=.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg
35 38
36[testenv:lower-constraints] 39[testenv:lower-constraints]
40basepython = python3
37deps = 41deps =
38 -c{toxinidir}/lower-constraints.txt 42 -c{toxinidir}/lower-constraints.txt
39 -r{toxinidir}/test-requirements.txt 43 -r{toxinidir}/test-requirements.txt