Ignore ez_setup.py properly

muddlebee · May 15, 2014 · 8aedd80 · 8aedd80
1 parent a6dae83
commit 8aedd80
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/.flake8 b/.flake8
@@ -8,3 +8,4 @@
 # F841: unused variable
 ignore=E241,E265,F401,E501,F821,F841
 max_complexity = 10
+exclude = ez_setup.py
diff --git a/.pylintrc b/.pylintrc
@@ -1,3 +1,6 @@
+[MASTER]
+ignore=ez_setup.py
+
 [MESSAGES CONTROL]
 disable=no-self-use,
         super-on-old-class,

diff --git a/scripts/run_checks.py b/scripts/run_checks.py
@@ -57,8 +57,8 @@
                      # (false-positives)
         ],
     },
-    'exclude': ['scripts.ez_setup'],
-    'exclude_pep257': ['test_*'],  # FIXME exclude ez_setup
+    'exclude': [],
+    'exclude_pep257': ['test_*', 'ez_setup'],
     'other': {
         'pylint': ['--output-format=colorized', '--reports=no',
                    '--rcfile=.pylintrc'],
@@ -174,10 +174,11 @@ def _get_args(checker):
             args += ['--disable=' + ','.join(options['disable']['pylint'])]
         except KeyError:
             pass
-        try:
-            args += ['--ignore=' + ','.join(options['exclude'])]
-        except KeyError:
-            pass
+        if options['exclude']:
+            try:
+                args += ['--ignore=' + ','.join(options['exclude'])]
+            except KeyError:
+                pass
         try:
             args += options['other']['pylint']
         except KeyError:
@@ -187,10 +188,11 @@ def _get_args(checker):
             args += ['--ignore=' + ','.join(options['disable']['flake8'])]
         except KeyError:
             pass
-        try:
-            args += ['--exclude=' + ','.join(options['exclude'])]
-        except KeyError:
-            pass
+        if options['exclude']:
+            try:
+                args += ['--exclude=' + ','.join(options['exclude'])]
+            except KeyError:
+                pass
         try:
             args += options['other']['flake8']
         except KeyError: