Blob Blame History Raw
From d6f8cda665221535c537abda3c80223cdef8b536 Mon Sep 17 00:00:00 2001
From: "huang.zhiping" <huang.zhiping@99cloud.net>
Date: Wed, 18 Jul 2018 16:57:32 -0400
Subject: [PATCH 15/21] Add 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: Ic4a3b28cb670c71fb205640a9a9338bbcf9bc9bf
---
 tox.ini | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index f93f347..ffe1237 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py34,py27,pep8
+envlist = py35,py27,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -9,6 +9,7 @@ deps = -r{toxinidir}/requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
+basepython = python3
 commands = flake8
            flake8 --filename=cfn-* bin
 
@@ -19,10 +20,12 @@ deps = -r{toxinidir}/requirements.txt
 commands = bash tools/lintstack.sh
 
 [testenv:cover]
+basepython = python3
 commands =
   python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:venv]
+basepython = python3
 commands = {posargs}
 
 [flake8]
@@ -30,6 +33,7 @@ show-source = true
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
 
 [testenv:docs]
+basepython = python3
 deps = -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html
 
-- 
2.20.1