Merge pull request #249 from vintasoftware/pylint-config

Add option to set pylintrc inside prospector.yml
prospector-dev · Jul 22, 2018 · 2455f10 · 2455f10
2 parents f431c83 + 1f63bf7
commit 2455f10
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/prospector/tools/pylint/__init__.py b/prospector/tools/pylint/__init__.py
@@ -162,7 +162,11 @@ def configure(self, prospector_config, found_files):
         linter = ProspectorLinter(found_files)
         if prospector_config.use_external_config('pylint'):
             # try to find a .pylintrc
-            pylintrc = prospector_config.external_config_location('pylint')
+            pylint_options = prospector_config.tool_options('pylint')
+            pylintrc = pylint_options.get('config_file')
+            external_config = prospector_config.external_config_location('pylint')
+            if pylintrc is None or external_config:
+                pylintrc = external_config
             if pylintrc is None:
                 pylintrc = find_pylintrc()
             if pylintrc is None: