diff options
| -rw-r--r-- | packages/debian/control.in | 4 | ||||
| -rw-r--r-- | test-requirements.txt | 6 | ||||
| -rw-r--r-- | tox.ini | 20 |
3 files changed, 12 insertions, 18 deletions
diff --git a/packages/debian/control.in b/packages/debian/control.in index b58561e7..6c39d531 100644 --- a/packages/debian/control.in +++ b/packages/debian/control.in @@ -6,10 +6,6 @@ Maintainer: Scott Moser <smoser@ubuntu.com> Build-Depends: debhelper (>= 9), dh-python, dh-systemd, - iproute2, - pep8, - pyflakes, - python3-pyflakes | pyflakes (<< 1.1.0-2), ${python}, ${test_requires}, ${requires} diff --git a/test-requirements.txt b/test-requirements.txt index 1b39ea5c..d9d41b57 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,9 +11,3 @@ coverage # Only really needed on older versions of python contextlib2 setuptools - -# Used for syle checking -pycodestyle==2.3.1 -pyflakes==1.5.0 -flake8==3.3.0 -hacking==0.13.0 @@ -4,13 +4,16 @@ recreate = True [testenv] commands = python -m nose {posargs:tests/unittests} -deps = -r{toxinidir}/test-requirements.txt - -r{toxinidir}/requirements.txt setenv = LC_ALL = en_US.utf-8 [testenv:flake8] basepython = python3 +deps = + pycodestyle==2.3.1 + pyflakes==1.5.0 + flake8==3.3.0 + hacking==0.13.0 commands = {envpython} -m flake8 {posargs:cloudinit/ tests/ tools/} # https://github.com/gabrielfalcao/HTTPretty/issues/223 @@ -23,11 +26,17 @@ commands = {envpython} -m pylint {posargs:cloudinit} [testenv:py3] basepython = python3 +deps = -r{toxinidir}/test-requirements.txt commands = {envpython} -m nose {posargs:--with-coverage \ --cover-erase --cover-branches --cover-inclusive \ --cover-package=cloudinit tests/unittests} +[testenv:py27] +basepython = python2.7 +deps = -r{toxinidir}/test-requirements.txt + [testenv:py26] +deps = -r{toxinidir}/test-requirements.txt commands = nosetests {posargs:tests/unittests} setenv = LC_ALL = C @@ -39,8 +48,7 @@ exclude = .venv,.tox,dist,doc,*egg,.git,build,tools [testenv:doc] basepython = python3 -deps = {[testenv]deps} - sphinx +deps = sphinx commands = {envpython} -m sphinx {posargs:doc/rtd doc/rtd_html} [testenv:xenial] @@ -63,10 +71,6 @@ deps = nose==1.3.7 unittest2==1.1.0 contextlib2==0.5.1 - pep8==1.7.0 - pyflakes==1.1.0 - flake8==2.5.4 - hacking==0.10.2 [testenv:centos6] basepython = python2.6 |