Merge pull request #3578 from jdufresne/tox-flake8

Add linting to the tox matrix

.travis.yml

@@ -65,7 +65,7 @@ services:
 install:
   - |
     if [ "$LINT" == "true" ]; then
-      pip install -U check-manifest flake8
+      pip install tox
     elif [ "$DOCKER" == "" ]; then
       .travis/install.sh;
     fi
@@ -84,8 +84,7 @@ before_script:
 script:
 - |
   if [ "$LINT" == "true" ]; then
-    flake8 --statistics --count
-    check-manifest
+    tox -e lint
   elif [ "$DOCKER" == "" ]; then
     .travis/script.sh
   elif [ "$DOCKER" ]; then

tox.ini

@@ -4,7 +4,10 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py35, py36, py37
+envlist =
+    lint
+    py{27,35,36,37}
+minversion = 1.9
 
 [testenv]
 commands =
@@ -18,3 +21,12 @@ deps =
     olefile
     pyroma
     pytest
+
+[testenv:lint]
+commands =
+    flake8 --statistics --count
+    check-manifest
+deps =
+    check-manifest
+    flake8
+skip_install = true