summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:38 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:38 -0400
commit7aa1c8e7d36fb68b1a3f020fbcbd45e4b0d1e9aa (patch)
tree2708c2365a0571f3db14fabd2324fdaef09f9735 /tox.ini
parent2865eaceea68d592b03018d09c64f01fe3456a44 (diff)
parent6b294286e0d0a1da6b24b338cae3b900a763e9d2 (diff)
downloadvyos-cloud-init-7aa1c8e7d36fb68b1a3f020fbcbd45e4b0d1e9aa.tar.gz
vyos-cloud-init-7aa1c8e7d36fb68b1a3f020fbcbd45e4b0d1e9aa.zip
merge trunk at 0.7.7~bzr1160
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 3 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index 3619edf4..849481f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,11 @@
[tox]
-envlist = py26,py27,py34
+envlist = py27,py34
recreate = True
[testenv]
commands = python -m nose {posargs:tests}
-deps =
- contextlib2
- httpretty>=0.7.1
- mock
- nose
- pep8==1.5.7
- pyflakes
+deps = -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/requirements.txt
# https://github.com/gabrielfalcao/HTTPretty/issues/223
setenv =