Combine lint and test-lint into a single command.

pcostell · pcostell · commit cdb728e43051 · 2015-11-05T17:17:43.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,6 @@ script:
 env:
   - TOXENV=py27
   - TOXENV=lint
-  - TOXENV=lint-test
 
 after_success:
   - tox -e coveralls
diff --git a/run_pylint.sh b/run_pylint.sh
@@ -6,10 +6,5 @@ TESTS=blobstore_test.py,context_test.py,eventloop_test.py,google_test_imports.py
 
 NON_TESTS=blobstore.py,context.py,django_middleware.py,eventloop.py,google_imports.py,__init__.py,key.py,metadata.py,model.py,msgprop.py,polymodel.py,prospective_search.py,query.py,stats.py,tasklets.py
 
-if [[ $* == *--test* ]]; then
-  echo "Ignoring non-test files: ${NON_TESTS}"
-  pylint --ignore=${NON_TESTS} --disable=invalid-name,W,I ndb
-else
-  echo "Ignoring test files: ${TESTS}"
-  pylint --ignore=${TESTS} --disable=W,I ndb
-fi
+pylint --ignore=${NON_TESTS} --disable=invalid-name,W,I ndb
+pylint --ignore=${TESTS} --disable=W,I ndb
diff --git a/tox.ini b/tox.ini
@@ -35,12 +35,4 @@ commands =
     ./run_pylint.sh
 deps =
     -ehg+https://bitbucket.org/logilab/pylint@33e334be064c#egg=pylint
-    logilab-common<=0.63.0  # Hack for pylint upstream
-
-[testenv:lint-test]
-basepython =
-    python2.7
-commands =
-    {[testenv:lint]commands} --test
-deps = 
-    {[testenv:lint]deps}
+    logilab-common<=0.63.0  # Hack for pylint upstream
