merge with trunk

1 files changed, 32 insertions, 0 deletions

diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..bd7c27dd
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,32 @@
+[tox]
+envlist = py27,py3,pyflakes
+recreate = True
+
+[testenv]
+commands = python -m nose {posargs:tests}
+deps = -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/requirements.txt
+
+[testenv:py3]
+basepython = python3
+
+[testenv:pyflakes]
+basepython = python3
+commands = {envpython} -m pyflakes {posargs:cloudinit/ tests/ tools/}
+   {envpython} -m pep8 {posargs:cloudinit/ tests/ tools/}
+
+# https://github.com/gabrielfalcao/HTTPretty/issues/223
+setenv =
+    LC_ALL = en_US.utf-8
+
+[testenv:py26]
+commands = nosetests {posargs:tests}
+deps =
+     contextlib2
+     httpretty>=0.7.1
+     mock
+     nose
+     pep8==1.5.7
+     pyflakes
+setenv =
+    LC_ALL = C