diff options
| author | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-02-04 19:20:17 -0600 |
|---|---|---|
| committer | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-02-04 19:20:17 -0600 |
| commit | 2f2bd4232b3f51f571f76c30b715c215e5815703 (patch) | |
| tree | 086f68ab8efe1b6fac204be34fa26efe2ad60f9f /tox.ini | |
| parent | 1f24e50c655ccc0c49afcd3225ce8f0e0bce05b9 (diff) | |
| parent | 6b294286e0d0a1da6b24b338cae3b900a763e9d2 (diff) | |
| download | vyos-cloud-init-2f2bd4232b3f51f571f76c30b715c215e5815703.tar.gz vyos-cloud-init-2f2bd4232b3f51f571f76c30b715c215e5815703.zip | |
Merge from trunk and resolve text conflict in ChangeLog
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -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 = |