|
 |
a64660 |
From d6f8cda665221535c537abda3c80223cdef8b536 Mon Sep 17 00:00:00 2001
|
|
|
a64660 |
From: "huang.zhiping" <huang.zhiping@99cloud.net>
|
|
|
a64660 |
Date: Wed, 18 Jul 2018 16:57:32 -0400
|
|
|
a64660 |
Subject: [PATCH 15/21] Add tox python3 overrides
|
|
|
a64660 |
|
|
|
a64660 |
We want to default to running all tox environments under python 3, so
|
|
|
a64660 |
set the basepython value in each environment.
|
|
|
a64660 |
|
|
|
a64660 |
We do not want to specify a minor version number, because we do not
|
|
|
a64660 |
want to have to update the file every time we upgrade python.
|
|
|
a64660 |
|
|
|
a64660 |
We do not want to set the override once in testenv, because that
|
|
|
a64660 |
breaks the more specific versions used in default environments like
|
|
|
a64660 |
py35 and py36.
|
|
|
a64660 |
|
|
|
a64660 |
Change-Id: Ic4a3b28cb670c71fb205640a9a9338bbcf9bc9bf
|
|
|
a64660 |
---
|
|
|
a64660 |
tox.ini | 6 +++++-
|
|
|
a64660 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
a64660 |
|
|
|
a64660 |
diff --git a/tox.ini b/tox.ini
|
|
|
a64660 |
index f93f347..ffe1237 100644
|
|
|
a64660 |
--- a/tox.ini
|
|
|
a64660 |
+++ b/tox.ini
|
|
|
a64660 |
@@ -1,5 +1,5 @@
|
|
|
a64660 |
[tox]
|
|
|
a64660 |
-envlist = py34,py27,pep8
|
|
|
a64660 |
+envlist = py35,py27,pep8
|
|
|
a64660 |
|
|
|
a64660 |
[testenv]
|
|
|
a64660 |
setenv = VIRTUAL_ENV={envdir}
|
|
|
a64660 |
@@ -9,6 +9,7 @@ deps = -r{toxinidir}/requirements.txt
|
|
|
a64660 |
commands = python setup.py testr --slowest --testr-args='{posargs}'
|
|
|
a64660 |
|
|
|
a64660 |
[testenv:pep8]
|
|
|
a64660 |
+basepython = python3
|
|
|
a64660 |
commands = flake8
|
|
|
a64660 |
flake8 --filename=cfn-* bin
|
|
|
a64660 |
|
|
|
a64660 |
@@ -19,10 +20,12 @@ deps = -r{toxinidir}/requirements.txt
|
|
|
a64660 |
commands = bash tools/lintstack.sh
|
|
|
a64660 |
|
|
|
a64660 |
[testenv:cover]
|
|
|
a64660 |
+basepython = python3
|
|
|
a64660 |
commands =
|
|
|
a64660 |
python setup.py testr --coverage --testr-args='{posargs}'
|
|
|
a64660 |
|
|
|
a64660 |
[testenv:venv]
|
|
|
a64660 |
+basepython = python3
|
|
|
a64660 |
commands = {posargs}
|
|
|
a64660 |
|
|
|
a64660 |
[flake8]
|
|
|
a64660 |
@@ -30,6 +33,7 @@ show-source = true
|
|
|
a64660 |
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
|
|
|
a64660 |
|
|
|
a64660 |
[testenv:docs]
|
|
|
a64660 |
+basepython = python3
|
|
|
a64660 |
deps = -r{toxinidir}/doc/requirements.txt
|
|
|
a64660 |
commands = sphinx-build -W -b html doc/source doc/build/html
|
|
|
a64660 |
|
|
|
a64660 |
--
|
|
|
a64660 |
2.20.1
|
|
|
a64660 |
|