Merge pull request #3236 from mdboom/pep8-tests-in-separate-config

tacaswell · tacaswell · commit 76694a78dd38 · 2014-07-12T14:31:47.000-04:00
Test PEP8 stuff in separate Travis build.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,9 @@ env:
     - secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
     - secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
 
+  matrix:
+    - TEST_ARGS=--no-pep8
+
 before_script:
   - gem install travis-artifacts
 
@@ -16,6 +19,11 @@ python:
   - 3.3
   - 3.4
 
+matrix:
+  include:
+    - python: 2.7
+      env: TEST_ARGS=--pep8
+
 install:
   - pip install -q --use-mirrors nose python-dateutil numpy pep8 pyparsing pillow
   - sudo apt-get update && sudo apt-get -qq install inkscape libav-tools
@@ -31,7 +39,7 @@ script:
   # Generate the font caches in a single process before starting the
   # multiple processes
   - python -c "from matplotlib import font_manager"
-  - python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300
+  - python ../matplotlib/tests.py -sv --processes=8 --process-timeout=300 $TEST_ARGS
 
 after_failure:
   - tar cjf result_images.tar.bz2 result_images
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1384,9 +1384,10 @@ def test(verbosity=1):
         # a list.
         multiprocess._instantiate_plugins = [KnownFailure]
 
-        success = nose.run( defaultTest=default_test_modules,
-                            config=config,
-                            )
+        success = nose.run(
+            defaultTest=default_test_modules,
+            config=config,
+        )
     finally:
         if old_backend.lower() != 'agg':
             use(old_backend)
diff --git a/tests.py b/tests.py
@@ -10,6 +10,7 @@
 # these options.
 
 import os
+import sys
 import time
 
 import matplotlib
@@ -39,4 +40,11 @@ def run():
               defaultTest=default_test_modules)
 
 if __name__ == '__main__':
+    if '--no-pep8' in sys.argv:
+        default_test_modules.remove('matplotlib.tests.test_coding_standards')
+        sys.argv.remove('--no-pep8')
+    elif '--pep8' in sys.argv:
+        default_test_modules = ['matplotlib.tests.test_coding_standards']
+        sys.argv.remove('--pep8')
+
     run()
