diff options
| author | Sankar Tanguturi <stanguturi@stanguturi-rhel> | 2016-03-11 11:29:15 -0800 |
|---|---|---|
| committer | Sankar Tanguturi <stanguturi@stanguturi-rhel> | 2016-03-11 11:29:15 -0800 |
| commit | a3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691 (patch) | |
| tree | 74a6ebbe7c91c30467577eb231fab8c5f188b93c /tox.ini | |
| parent | a6e0922a4d34ede6df000dd8fc4bb3531218d69f (diff) | |
| parent | 41470d29f5888baf7ec78e170cc0d6d981dcf63e (diff) | |
| download | vyos-cloud-init-a3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691.tar.gz vyos-cloud-init-a3fd7441f8ea4d25e96b9bc0eca7cbb6164a4691.zip | |
- Executed 'bzr merge' and resolved all the conflicts.
- Now my branch is identical to trunk.dist
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -1,16 +1,19 @@ [tox] -envlist = py26,py27,py34 +envlist = py27,py3,pyflakes 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 + +[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 = |