summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2018-09-26 18:58:25 -0400
committerBrian Haley <bhaley@redhat.com>2018-10-17 00:16:11 -0400
commit8857a844ba5eb59c87c5517dd08d3627cdc3e79c (patch)
tree56c651cacd7243b8d0411497adda8af23f09b419
parentcdad349eaa2cc4afdf60e84487948681de0c4126 (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: I6e18dd70a74694ba2e7aad535f487498a26d05bb Signed-off-by: Doug Hellmann <doug@doughellmann.com>
Notes
Notes (review): Code-Review+2: Brian Haley <haleyb.dev@gmail.com> Code-Review+2: Slawek Kaplonski <skaplons@redhat.com> Workflow+1: Slawek Kaplonski <skaplons@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 17 Oct 2018 09:26:53 +0000 Reviewed-on: https://review.openstack.org/606680 Project: openstack/neutron-specs Branch: refs/heads/master
-rw-r--r--specs/mitaka/bgp-dynamic-routing.rst2
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 1 deletions
diff --git a/specs/mitaka/bgp-dynamic-routing.rst b/specs/mitaka/bgp-dynamic-routing.rst
index 4602f9a..225cb76 100644
--- a/specs/mitaka/bgp-dynamic-routing.rst
+++ b/specs/mitaka/bgp-dynamic-routing.rst
@@ -47,7 +47,7 @@ the cloud reachable through the remaining healthy link.
47 47
48 group { 48 group {
49 color = lightgreen; 49 color = lightgreen;
50 label = "OpenStack Deployment"; 50 //label = "OpenStack Deployment";
51 gateway_router; 51 gateway_router;
52 tenant_router1; 52 tenant_router1;
53 tenant_router2; 53 tenant_router2;
diff --git a/tox.ini b/tox.ini
index b10fe74..959e35c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,9 +19,11 @@ deps =
19commands = stestr run --slowest {posargs} 19commands = stestr run --slowest {posargs}
20 20
21[testenv:venv] 21[testenv:venv]
22basepython = python3
22commands = {posargs} 23commands = {posargs}
23 24
24[testenv:docs] 25[testenv:docs]
26basepython = python3
25deps = 27deps =
26 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} 28 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
27 -r{toxinidir}/doc/requirements.txt 29 -r{toxinidir}/doc/requirements.txt