cloud-init-dev team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging ~smoser/cloud-init:bug/package-build-no-stylechecks into cloud-init:master.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/324541
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:bug/package-build-no-stylechecks into cloud-init:master.

diff --git a/test-requirements.txt b/test-requirements.txt
index 1b39ea5..d9d41b5 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
diff --git a/tox.ini b/tox.ini
index 03bb5f1..3b4409f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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,13 @@ 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:py26]
+deps = -r{toxinidir}/test-requirements.txt
 commands = nosetests {posargs:tests/unittests}
 setenv =
     LC_ALL = C
@@ -39,8 +44,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 +67,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