summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-02-04 16:59:28 -0500
committerScott Moser <smoser@ubuntu.com>2016-02-04 16:59:28 -0500
commit8de3497e361c7d8050a232f4682988ed4ed59734 (patch)
treea9f0cecdcbe30ee3294d4e42328af93d7f70d800
parentf512c0126aac5c8708065c6e8aa5510f83574657 (diff)
downloadvyos-cloud-init-8de3497e361c7d8050a232f4682988ed4ed59734.tar.gz
vyos-cloud-init-8de3497e361c7d8050a232f4682988ed4ed59734.zip
tox: use test-requirements.txt and requirements.txt
This just allows stops us from repeating ourselves in tox.ini from what is in test-requirements and requirements.txt.
-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 =