prospector 1.11.0__py3-none-any.whl → 1.12.0__py3-none-any.whl

prospector/blender.py

@@ -4,9 +4,9 @@
 # the same line. For example, both pyflakes and pylint will generate an
 # "Unused Import" warning on the same line. This is obviously redundant, so we
 # remove duplicates.
+import pkgutil
 from collections import defaultdict
 
-import pkg_resources
 import yaml
 
 __all__ = (
@@ -98,7 +98,7 @@ def blend(messages, blend_combos=None):
 
 
 def get_default_blend_combinations():
-    combos = yaml.safe_load(pkg_resources.resource_string(__name__, "blender_combinations.yaml"))
+    combos = yaml.safe_load(pkgutil.get_data(__name__, "blender_combinations.yaml"))
     combos = combos.get("combinations", [])
 
     defaults = []

prospector/config/configuration.py

@@ -1,5 +1,6 @@
 # flake8: noqa
-import pkg_resources
+import importlib.metadata
+
 import setoptconf as soc
 
 from prospector.config.datatype import OutputChoice
@@ -8,7 +9,7 @@ from prospector.tools import DEFAULT_TOOLS, TOOLS
 
 __all__ = ("build_manager",)
 
-_VERSION = pkg_resources.get_distribution("prospector").version
+_VERSION = importlib.metadata.version("prospector")
 
 
 def build_manager():

prospector/profiles/profile.py

@@ -121,7 +121,7 @@ def _load_content_package(name):
     file_names = (
         ["prospector.yaml", "prospector.yml"]
         if len(name_split) == 1
-        else [f"{name_split[1]}.yaml", f"{name_split[1]}.yaml"]
+        else [f"{name_split[1]}.yaml", f"{name_split[1]}.yml"]
     )
 
     data = None

prospector/tools/mypy/__init__.py

@@ -21,6 +21,7 @@ VALID_OPTIONS = LIST_OPTIONS + [
     "python-2-mode",
     "python-version",
     "namespace-packages",
+    "check-untyped-defs",
 ]
 
 
@@ -90,6 +91,7 @@ class MypyTool(ToolBase):
         python_version = options.get("python-version", None)
         strict_optional = options.get("strict-optional", False)
         namespace_packages = options.get("namespace-packages", False)
+        check_untyped_defs = options.get("check-untyped-defs", False)
 
         self.options.append(f"--follow-imports={follow_imports}")
 
@@ -117,6 +119,9 @@ class MypyTool(ToolBase):
         if namespace_packages:
             self.options.append("--namespace-packages")
 
+        if check_untyped_defs:
+            self.options.append("--check-untyped-defs")
+
         for list_option in LIST_OPTIONS:
             for entry in options.get(list_option, []):
                 self.options.append(f"--{list_option}-{entry}")

prospector/tools/pylint/__init__.py

@@ -64,7 +64,7 @@ class PylintTool(ToolBase):
                 continue
             for option in checker.options:
                 if option[0] in options:
-                    checker.set_option(option[0], options[option[0]])
+                    checker._arguments_manager.set_option(option[0], options[option[0]])
 
         # The warnings about disabling warnings are useful for figuring out
         # with other tools to suppress messages from. For example, an unused
@@ -167,7 +167,7 @@ class PylintTool(ToolBase):
     def _get_pylint_configuration(
         self, check_paths: List[Path], linter: ProspectorLinter, prospector_config, pylint_options
     ):
-        self._args = linter.load_command_line_configuration(str(path) for path in check_paths)
+        self._args = check_paths
         linter.load_default_plugins()
 
         config_messages = self._prospector_configure(prospector_config, linter)

prospector/tools/pylint/linter.py

@@ -2,8 +2,10 @@ from pathlib import Path
 
 from packaging import version as packaging_version
 from pylint import version as pylint_version
+from pylint.config.config_file_parser import _ConfigurationFileParser
+from pylint.config.config_initialization import _order_all_first
 from pylint.lint import PyLinter
-from pylint.utils import _splitstrip
+from pylint.utils import _splitstrip, utils
 
 
 class ProspectorLinter(PyLinter):
@@ -12,13 +14,49 @@ class ProspectorLinter(PyLinter):
         # set up the standard PyLint linter
         PyLinter.__init__(self, *args, **kwargs)
 
+    # Largely inspired by https://github.com/pylint-dev/pylint/blob/main/pylint/config/config_initialization.py#L26
     def config_from_file(self, config_file=None):
         """Will return `True` if plugins have been loaded. For pylint>=1.5. Else `False`."""
-        self.read_config_file(config_file)
-        if self.cfgfile_parser.has_option("MASTER", "load-plugins"):
-            plugins = _splitstrip(self.cfgfile_parser.get("MASTER", "load-plugins"))
+        config_file_parser = _ConfigurationFileParser(False, self)
+        config_data, config_args = config_file_parser.parse_config_file(file_path=config_file)
+        if config_data.get("MASTER", {}).get("load-plugins"):
+            plugins = _splitstrip(config_data["MASTER"]["load-plugins"])
             self.load_plugin_modules(plugins)
-        self.load_config_file()
+
+        config_args = _order_all_first(config_args, joined=False)
+
+        if "init-hook" in config_data:
+            exec(utils._unquote(config_data["init-hook"]))  # pylint: disable=exec-used
+
+        # Load plugins if specified in the config file
+        if "load-plugins" in config_data:
+            self.load_plugin_modules(utils._splitstrip(config_data["load-plugins"]))
+
+        self._parse_configuration_file(config_args)
+
+        # Set the current module to the command line
+        # to allow raising messages on it
+        self.set_current_module(config_file)
+
+        self._emit_stashed_messages()
+
+        # Set the current module to configuration as we don't know where
+        # the --load-plugins key is coming from
+        self.set_current_module("Command line or configuration file")
+
+        # We have loaded configuration from config file and command line. Now, we can
+        # load plugin specific configuration.
+        self.load_plugin_configuration()
+
+        # Now that plugins are loaded, get list of all fail_on messages, and
+        # enable them
+        self.enable_fail_on_messages()
+
+        self._parse_error_mode()
+
+        # Link the base Namespace object on the current directory
+        self._directory_namespaces[Path().resolve()] = (self.config, {})
+
         return True
 
     def _expand_files(self, modules):

{prospector-1.11.0.dist-info → prospector-1.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prospector
-Version: 1.11.0
+Version: 1.12.0
 Summary: Prospector is a tool to analyse Python code by aggregating the result of other tools.
 Home-page: http://prospector.readthedocs.io
 License: GPLv2+
@@ -44,7 +44,7 @@ Requires-Dist: pep8-naming (>=0.3.3,<=0.10.0)
 Requires-Dist: pycodestyle (>=2.9.0)
 Requires-Dist: pydocstyle (>=2.0.0)
 Requires-Dist: pyflakes (>=2.2.0,<4)
-Requires-Dist: pylint (>=2.8.3,<3.0)
+Requires-Dist: pylint (>=3.0)
 Requires-Dist: pylint-celery (==0.3)
 Requires-Dist: pylint-django (>=2.5,<2.6)
 Requires-Dist: pylint-flask (==0.6)

{prospector-1.11.0.dist-info → prospector-1.12.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 prospector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prospector/__main__.py,sha256=-gdHYZxwq_P8er7HuZEBImY0pwaFq8uIa78dQdJsTTQ,71
 prospector/autodetect.py,sha256=ANuy7FBrxLxKP9pKELbCvBWHIHhm9g5B4kYbe5yyM5Q,2955
-prospector/blender.py,sha256=TXRme_bHKAi1eDREKGklSwUtcadQr-2E0EoX4AHxRL4,4444
+prospector/blender.py,sha256=2-DktYCi5WRF-9vCXjN8ksb8NBGb15Mmf_MmnIhpujE,4425
 prospector/blender_combinations.yaml,sha256=yN7BOUCDomDZVRZzYxsRdxQPLpzxm9TDhv18B_GdLPU,6551
 prospector/compat.py,sha256=p_2BOebzUcKbUAd7mW8rn6tIc10R96gJuZS71QI0XY4,360
 prospector/config/__init__.py,sha256=yUO3j4DwpCTP6p3In8NzIUDf8dMMyYw8eX28yAvOl0c,13537
-prospector/config/configuration.py,sha256=0upMM9OvW93rW8TIrtP7yo_n6MWCh1gfCDjVwx_CW2M,13905
+prospector/config/configuration.py,sha256=P1fIMqJrs1vAYyJ86JacbGdjJpsoAPOre7KTt0-fmx4,13899
 prospector/config/datatype.py,sha256=YuiwM-t89DGAmiBvkGA3y3roTTIKMCveIZnXVsZaWSQ,628
 prospector/encoding.py,sha256=3t4FjHgNlInyth7IYgBiJcD3a3iUYLdZQEBhNADx_44,1542
 prospector/exceptions.py,sha256=Vlu5FB0cDUO1BOgDTqk49-zq-GrcaC2RtXFuuS1347Y,1290
@@ -25,7 +25,7 @@ prospector/pathutils.py,sha256=81z36CjcbTb0JtvOdH0_FmT99PjAW4NbTF0TxJF884A,1306
 prospector/postfilter.py,sha256=yzQHhj_qnRZlQ1MGj5FXtBs7zWh4l68kaDa58ZIjGE0,2235
 prospector/profiles/__init__.py,sha256=q9zPLVEwo7qoouYFrmENsmByFrKKkr27Dd_Wo9btTJI,683
 prospector/profiles/exceptions.py,sha256=CpFTGZN55DW_CoUQdJH6DduM1fm8zfhNx5CHRCjv0kA,871
-prospector/profiles/profile.py,sha256=aJElTo_nTdI-3HGb0N0PAlWC_AcwmRYUXmE-6nl6LTo,16442
+prospector/profiles/profile.py,sha256=Yz5UyKl0A8dXpbMoGQRp5tvW3fUX6K_na22-y-N_DIQ,16441
 prospector/profiles/profiles/default.yaml,sha256=tMy-G49ZdV7gkfBoN2ngtIWha3n7JVr_rEeNkLzpKsk,100
 prospector/profiles/profiles/doc_warnings.yaml,sha256=K_cBhUeKnSvOCwgwXE2tMZ-Fr5cJovC1XSholWglzN4,48
 prospector/profiles/profiles/flake8.yaml,sha256=wC-TJYuVobo9zPm4Yc_Ocd4Wwfemx0IufmAnfiuKkHk,156
@@ -50,20 +50,20 @@ prospector/tools/base.py,sha256=-Mj36ClqymzKl0WtigJd_3_8TZo2ZT4F3YIkj6tmv9Y,1575
 prospector/tools/dodgy/__init__.py,sha256=URSC-puhNw90Qj9CSHXZrLvVoj41hHBIgSKsGYgHTGM,1481
 prospector/tools/exceptions.py,sha256=Q-u4n6YzZuoMu17XkeKac1o1gBY36JK4MnvWaYrVYL0,170
 prospector/tools/mccabe/__init__.py,sha256=jFWsXzXMl1T_0IOQOYZ1CN0PGg1E4_dzOkrfnkKYISs,2919
-prospector/tools/mypy/__init__.py,sha256=6S3hL2OHmxQJznriPIAeXqp6Bu8AGgTi_K_FOfsPMU4,4367
+prospector/tools/mypy/__init__.py,sha256=9iEDJCvII-3tSseWRZ2tKHVL18ZzwRkaM15RT74Jy5I,4551
 prospector/tools/profile_validator/__init__.py,sha256=oIGcqLqgOQXZ3DRyGIzEEWBlyH7PWmAPQ2i5WQ8Mx_U,7930
 prospector/tools/pycodestyle/__init__.py,sha256=3e8bQWiuUuHPX8jVlZOPj78nSHlyRI7tc-YB3lV9TK8,5452
 prospector/tools/pydocstyle/__init__.py,sha256=kwyvkT372J3rQrTK8MdhQMB8jHShoMu_Bcp0DXiA5Ts,2537
 prospector/tools/pyflakes/__init__.py,sha256=VgIBmp2orCq2qe374ea9XP0-rudHs09y-SniSuLYvMk,4997
-prospector/tools/pylint/__init__.py,sha256=BP0o0RtwihpbyfPcsWtXXJX38ie-88F411ESMYDbu3U,10032
+prospector/tools/pylint/__init__.py,sha256=gMByTzq970QwHnom0aOq1hPJhA7c-g8T11YCn9H-fxY,9989
 prospector/tools/pylint/collector.py,sha256=TBvQpXWTcjIaIkZSEv7TWLz4VY9mgBM3xZaOmVz0N40,1334
-prospector/tools/pylint/linter.py,sha256=hNxHO8wkcNjjQf-rPmXCpX-Enkt0lmapcrxIWwJiFkE,1820
+prospector/tools/pylint/linter.py,sha256=tINIH5h-dYFOwrHNn8tH9ZAr1ktLlFytTwLNU_WU-WA,3437
 prospector/tools/pyright/__init__.py,sha256=rpVe7XmEHCViQsyg6DN9sI5_b9tCO2fFeSuZfEqcaL8,2931
 prospector/tools/pyroma/__init__.py,sha256=yf5TiA0fB2bxjtqwfod3ahx5hnFyk9iy6u6C3H6VF-4,2947
 prospector/tools/utils.py,sha256=rOGn_FAiLHG9CS6KzE8FAJzXkEJMzdFYS29U19Ad7bA,1161
 prospector/tools/vulture/__init__.py,sha256=blzCrLQkGsvUuD6pp5ST3vgwvHvQ7jv-kqgY_Lukh1Q,3058
-prospector-1.11.0.dist-info/entry_points.txt,sha256=SxvCGt8MJTEZefHAvwnUc6jDetgCaaYY1Zpifuk8tqU,50
-prospector-1.11.0.dist-info/LICENSE,sha256=WoTRadDy8VbcIKoVzl5Q1QipuD_cexAf3ul4MaVLttc,18044
-prospector-1.11.0.dist-info/WHEEL,sha256=gSF7fibx4crkLz_A-IKR6kcuq0jJ64KNCkG8_bcaEao,88
-prospector-1.11.0.dist-info/METADATA,sha256=UthQhxdRGU81ajTG8DBnac9lYdGLb9L5DNNQh8cIPQo,10008
-prospector-1.11.0.dist-info/RECORD,,
+prospector-1.12.0.dist-info/entry_points.txt,sha256=SxvCGt8MJTEZefHAvwnUc6jDetgCaaYY1Zpifuk8tqU,50
+prospector-1.12.0.dist-info/LICENSE,sha256=WoTRadDy8VbcIKoVzl5Q1QipuD_cexAf3ul4MaVLttc,18044
+prospector-1.12.0.dist-info/WHEEL,sha256=gSF7fibx4crkLz_A-IKR6kcuq0jJ64KNCkG8_bcaEao,88
+prospector-1.12.0.dist-info/METADATA,sha256=ML95Cb9SxjqTaYhAZ2Gink_JNL6-ZNLhZ3MX00DulII,10001
+prospector-1.12.0.dist-info/RECORD,,