summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-02-29 23:26:45 -0500
committerScott Moser <smoser@ubuntu.com>2016-02-29 23:26:45 -0500
commitb65a48dd58371614495ec55bf45fa6b06b7b52d6 (patch)
tree89904edd020019dbf5a08ae820da9caa6db7dcdd
parent4b22f00f02c6cccd88a81f05db8cc33a4e9a7419 (diff)
parentb7a6e92274bb0d146c4637a78128bc771f2612e9 (diff)
downloadvyos-cloud-init-b65a48dd58371614495ec55bf45fa6b06b7b52d6.tar.gz
vyos-cloud-init-b65a48dd58371614495ec55bf45fa6b06b7b52d6.zip
merge with trunk
-rw-r--r--tox.ini5
1 files changed, 4 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 849481f0..b72df0c9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py27,py34
+envlist = py27,py3
recreate = True
[testenv]
@@ -7,6 +7,9 @@ commands = python -m nose {posargs:tests}
deps = -r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
+[testenv:py3]
+basepython = python3
+
# https://github.com/gabrielfalcao/HTTPretty/issues/223
setenv =
LC_ALL = en_US.utf-8