diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-20 22:38:26 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-20 22:38:26 -0400 |
| commit | b0ea6e5a2c1c26b8faf1dc8303feebb00344e537 (patch) | |
| tree | 1ec50e5f8c07ab1c7b4e206a5d0c7dca0858b640 /tox.ini | |
| parent | fe6919dcd37c6c1ecd371e5eb20b605ab20a6420 (diff) | |
| parent | 776b0cfe847f531d8d5a235f52673c3da1f06064 (diff) | |
| download | vyos-cloud-init-b0ea6e5a2c1c26b8faf1dc8303feebb00344e537.tar.gz vyos-cloud-init-b0ea6e5a2c1c26b8faf1dc8303feebb00344e537.zip | |
merge with trunk.
test runs to the point where it did, think I got most of the changes
incorporated.
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -5,10 +5,9 @@ recreate = True [testenv] commands = python -m nose {posargs:tests} deps = -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt - -[testenv:py3] -basepython = python3 + -r{toxinidir}/requirements.txt +setenv = + LC_ALL = en_US.utf-8 [testenv:flake8] basepython = python3 @@ -18,15 +17,11 @@ commands = {envpython} -m flake8 {posargs:cloudinit/ tests/ tools/} setenv = LC_ALL = en_US.utf-8 +[testenv:py3] +basepython = python3 + [testenv:py26] commands = nosetests {posargs:tests} -deps = - contextlib2 - httpretty>=0.7.1 - mock - nose - pep8==1.5.7 - pyflakes setenv = LC_ALL = C |