prospector 1.15.2__py3-none-any.whl → 1.15.4a1__py3-none-any.whl

prospector/autodetect.py

@@ -11,7 +11,7 @@ from prospector import encoding
 from prospector.exceptions import PermissionMissing
 from prospector.pathutils import is_virtualenv
 
-POSSIBLE_LIBRARIES = ("django", "celery", "flask")
+POSSIBLE_LIBRARIES = ("django", "celery")
 
 
 # see http://docs.python.org/2/reference/lexical_analysis.html#identifiers

prospector/blender_combinations.yaml

@@ -4,17 +4,22 @@
 #
 # Note that since not all tools will necessarily be run, the first message for
 # a line as sorted by the code list will be the one remaining after blending.
+#
+# We put at first the PyLint, mypy and Ruff codes because we can
+# ignore a specific code on a specific line.
 
 combinations:
   - # Unused Import
     - pylint: unused-import
+    - pylint: W0611
+    - ruff: F401
     - pyflakes: F401
     - frosted: E101
-    - ruff: F401
 
   - # Syntax Error
-    - dodgy: diff
     - pylint: syntax-error
+    - pylint: E0001
+    - dodgy: diff
     - pyflakes: F999
     - pep8: E901
     # expected an indented block
@@ -26,362 +31,416 @@ combinations:
 
   - # Undefined local variable
     - pylint: undefined-variable
+    - pylint: E0602
+    - mypy: name-defined
+    - ruff: F821
     - pyflakes: F821
     - frosted: E303
-    - ruff: F821
-    - mypy: name-defined
 
   - # Unused variable
     - pylint: unused-variable
+    - pylint: W0612
+    - ruff: F841
     - vulture: unused-variable
     - pyflakes: F841
     - frosted: E307
-    - ruff: F841
 
   - # Mixed tabs and spaces
+    - pylint: indentation-mixture
+    - ruff: D206
     - pep257: D206
     - pydocstyle: D206
     - pep8: E101
     - pycodestyle: E101
-    - pylint: indentation-mixture
-    - ruff: D206
 
   - # Import from __future__ not first import
     - pylint: misplaced-future
+    - pylint: W0410
+    - ruff: F404
     - pyflakes: F404
     - frosted: E207
-    - ruff: F404
 
   - # Line too long
+    - pylint: line-too-long
+    - pylint: C0301
     - pep8: E501
     - pycodestyle: E501
-    - pylint: line-too-long
 
   - # Trailing whitespace
+    - pylint: trailing-whitespace
+    - pylint: C0303
     - pep8: W291
     - pycodestyle: W291
-    - pylint: trailing-whitespace
 
   - # Blank line contains whitespace
+    - pylint: trailing-whitespace
+    - pylint: C0303
     - pep8: W293
     - pycodestyle: W293
-    - pylint: trailing-whitespace
 
   - # No newline at end of file
+    - pylint: missing-final-newline
+    - pylint: C0304
     - pep8: W292
     - pycodestyle: W292
-    - pylint: missing-final-newline
 
   - # line ends with semi-colon
+    - pylint: unnecessary-semicolon
+    - pylint: W0301
     - pep8: E703
     - pycodestyle: E703
-    - pylint: unnecessary-semicolon
 
   - # multiple statements on one line (colon)
+    - pylint: multiple-statements
+    - pylint: C0321
     - pep8: E701
     - pycodestyle: E701
-    - pylint: multiple-statements
 
   - # multiple statements on one line (semicolon)
+    - pylint: multiple-statements
+    - pylint: C0321
     - pep8: E702
     - pycodestyle: E702
-    - pylint: multiple-statements
 
   - # incorrect indentation
+    - pylint: bad-indentation
+    - pylint: W0311
+    - ruff: D207
     - pep257: D207
     - pydocstyle: D207
     - pep8: E111
     - pycodestyle: E111
-    - pylint: bad-indentation
-    - ruff: D207
 
   - # incorrect indentation
+    - pylint: bad-indentation
+    - pylint: W0311
+    - ruff: D208
     - pep257: D208
     - pydocstyle: D208
     - pep8: E111
     - pycodestyle: E111
-    - pylint: bad-indentation
-    - ruff: D208
 
   - # comma not followed by a space
-    - pep8: E231
-    - pycodestyle: E231
     - pylint: C0324
     - pylint: bad-whitespace
+    - pep8: E231
+    - pycodestyle: E231
 
   - # missing whitespace around operator
-    - pep8: E225
-    - pycodestyle: E225
     - pylint: C0322
     - pylint: bad-whitespace
-
-  - # missing whitespace around operator
     - pep8: E225
     - pycodestyle: E225
+
+  - # missing whitespace around operator
     - pylint: C0323
     - pylint: bad-whitespace
+    - pep8: E225
+    - pycodestyle: E225
 
   - # undefined name in __all__
     - pylint: undefined-all-variable
+    - pylint: E0603
+    - ruff: F822
     - pyflakes: F822
     - frosted: E304
-    - ruff: F822
 
   - # duplicate argument in function definition
     - pylint: duplicate-argument-name
+    - pylint: E0108
+    - ruff: F831
     - pyflakes: F831
     - frosted: E206
-    - ruff: F831
 
   - # redefinition of unused function
-    - pyflakes: F811
     - pylint: function-redefined
+    - pylint: E0102
     - ruff: F811
+    - pyflakes: F811
 
   - # f-string is missing placeholders
     - pylint: f-string-without-interpolation
-    - pyflakes: F541
+    - pylint: W1309
     - ruff: F541
+    - pyflakes: F541
 
   - # Duplicate key in dictionary
     - pylint: duplicate-key
-    - pyflakes: F601
+    - pylint: W0109
     - ruff: F601
+    - pyflakes: F601
 
   - # More than one starred expression in assignment
     - pylint: too-many-star-expressions
-    - pyflakes: F622
+    - pylint: E0112
     - ruff: F622
+    - pyflakes: F622
 
   - # Assert called on a tuple
     - pylint: assert-on-tuple
-    - pyflakes: F631
+    - pylint: W0199
     - ruff: F631
+    - pyflakes: F631
 
   - # 'break' outside loop
     - pylint: not-in-loop
-    - pyflakes: F701
+    - pylint: E0103
     - ruff: F701
+    - pyflakes: F701
 
   - # 'continue' not properly in loop
     - pylint: not-in-loop
-    - pyflakes: F702
+    - pylint: E0103
     - ruff: F702
+    - pyflakes: F702
 
   - # 'continue' not supported inside 'finally' clause
     - pylint: continue-in-finally
     - pylint: E0116
-    - pyflakes: F703
     - ruff: F703
     - ruff: PLE0116
+    - pyflakes: F703
 
   - # Yield outside function
     - pylint: yield-outside-function
-    - pyflakes: F704
+    - pylint: E0105
     - ruff: F704
+    - pyflakes: F704
 
   - # Return outside function
     - pylint: return-outside-function
-    - pyflakes: F706
+    - pylint: E0104
     - ruff: F706
+    - pyflakes: F706
 
   - # default 'except:' must be last
     - pylint: bad-except-order
-    - pyflakes: F707
+    - pylint: E0701
     - ruff: F707
+    - pyflakes: F707
 
   - # NotImplemented raised - should raise NotImplementedError
     - pylint: notimplemented-raised
-    - pyflakes: F901
+    - pylint: E0711
     - ruff: F901
+    - pyflakes: F901
 
   - # first argument of a classmethod should be named 'cls'
-    - pep8: N804
-    - pycodestyle: N804
     - pylint: bad-classmethod-argument
+    - pylint: C0202
     - ruff: N804
+    - pep8: N804
+    - pycodestyle: N804
 
   - # '<>' is deprecated, use '!='
+    - pylint: W0331
     - pep8: W603
     - pycodestyle: W603
-    - pylint: W0331
 
   - # backticks are deprecated, use 'repr()'
+    - pylint: W0333
     - pep8: W604
     - pycodestyle: W604
-    - pylint: W0333
 
   - # Redefining name from outer scope
     - pylint: redefined-outer-name
+    - pylint: W0621
+    - ruff: F810
     - pyflakes: F810
     - frosted: E306
-    - ruff: F810
 
   - # Redefinition of unused variable
     - pylint: redefined-outer-name
+    - pylint: W0621
     - pyflakes: F811
 
   - # Wildcard import
     - pylint: wildcard-import
+    - pylint: W0614
+    - ruff: F403
     - pyflakes: F403
     - frosted: E103
-    - ruff: F403
 
   - # Return with argument inside generator
     - pylint: return-arg-in-generator
+    - pylint: E0110
     - frosted: E208
 
   - # Too many positional arguments for function call
     - pylint: too-many-function-args
+    - pylint: E1121
     - frosted: E203
 
   - # Passing unexpected keyword argument
     - pylint: unexpected-keyword-arg
+    - pylint: E1123
     - frosted: E204
 
   - # Missing mandatory keyword argument
     - pylint: missing-kwoa
+    - pylint: E1125
     - frosted: E205
 
   - # No exception type(s) specified
     - pylint: bare-except
-    - frosted: W101
-    - pep8: E722
-    - pycodestyle: E722
+    - pylint: W0702
     - ruff: E722
     # try_except_pass
     - ruff: S110
+    - frosted: W101
+    - pep8: E722
+    - pycodestyle: E722
     - bandit: B110
 
   - # No exception type(s) specified
     - pylint: bare-except
-    - frosted: W101
-    - pep8: E722
-    - pycodestyle: E722
+    - pylint: W0702
     - ruff: E722
     # try_except_continue
     - ruff: S112
+    - frosted: W101
+    - pep8: E722
+    - pycodestyle: E722
     - bandit: B112
 
   - # Do not catch blind exception: `Exception`
     - pylint: broad-exception-caught
+    - pylint: W0718
     - ruff: BLE001
 
+  - # Do not catch blind exception: `BaseException`
+    - pylint: broad-except
+    - pylint: W0703
+    - ruff: BLE002
+
   - # Create your own exception
     - pylint: broad-exception-raised
+    - pylint: W0719
     - ruff: TRY002
 
   - # Spaces around keyword/parameter equals
+    - pylint: bad-whitespace
     - pep8: E251
     - pycodestyle: E251
-    - pylint: bad-whitespace
 
   - # Missing space after a comma
+    - pylint: bad-whitespace
     - pep8: E231
     - pycodestyle: E231
-    - pylint: bad-whitespace
 
   - # redefinition of unused %r from line %r
+    - ruff: F811
     - pyflakes: F811
     - frosted: E301
-    - ruff: F811
 
   - # list comprehension redefines %r from line %r
+    - ruff: F812
     - pyflakes: F812
     - frosted: E302
-    - ruff: F812
 
   - # import %r from line %r shadowed by loop variable
+    - ruff: F402
     - pyflakes: F402
     - frosted: E102
-    - ruff: F402
 
   - # syntax error in doctest
+    - ruff: FL0007
     - pyflakes: FL0007
     - frosted: E401
-    - ruff: FL0007
 
   - # local variable %r referenced before assignment
+    - ruff: F823
     - pyflakes: F823
     - frosted: E305
-    - ruff: F823
 
   - # pep8-naming incorrectly suggests that the first argument of a metaclass __new__ method should be 'cls'
     - pylint: bad-mcs-classmethod-argument
+    - pylint: C0204
     - pep8: N804
     - pycodestyle: N804
 
   - # class names should be camelcase
+    - pylint: invalid-name
+    - pylint: C0103
     - pep8: N801
     - pycodestyle: N801
-    - pylint: invalid-name
 
-  # function name should be lowercase
-  - - pylint: invalid-name
+  - # function name should be lowercase
+    - pylint: invalid-name
+    - pylint: C0103
+    - ruff: N802
     - pep8: N802
     - pycodestyle: N802
-    - ruff: N802
 
-  # argument name should be lowercase
-  - - pylint: invalid-name
+  - # argument name should be lowercase
+    - pylint: invalid-name
+    - pylint: C0103
+    - ruff: N803
     - pep8: N803
     - pycodestyle: N803
-    - ruff: N803
 
-  # Variable in function should be lowercase
-  - - pylint: invalid-name
+  - # Variable in function should be lowercase
+    - pylint: invalid-name
+    - pylint: C0103
+    - ruff: N806
     - pep8: N806
     - pycodestyle: N806
-    - ruff: N806
 
   # too complex
   - #	Too many branches ({branches} > {max_branches})
     - pylint: too-many-branches
     - pylint: R0912
-    - mccabe: MC0001
     - ruff: PLR0912
+    - mccabe: MC0001
+
   - #	Too many statements ({statements} > {max_statements})
     - pylint: too-many-statements
     - pylint: R0915
-    - mccabe: MC0001
-    - pylint: too-many-statements
     - ruff: PLR0915
+    - mccabe: MC0001
 
   - # pep257 takes preference over pylint documentation warnings
-    - pep257: D100
-    - pydocstyle: D100
     - pylint: missing-docstring
+    - pylint: C0111
     - ruff: D100
+    - pep257: D100
+    - pydocstyle: D100
 
   - # Missing docstring in public class
-    - pep257: D101
-    - pydocstyle: D101
     - pylint: missing-docstring
+    - pylint: C0111
     - ruff: D101
+    - pep257: D101
+    - pydocstyle: D101
 
   - # Missing docstring in public method
-    - pep257: D102
-    - pydocstyle: D102
     - pylint: missing-docstring
+    - pylint: C0111
     - ruff: D102
+    - pep257: D102
+    - pydocstyle: D102
 
   - # Missing docstring in public function
-    - pep257: D103
-    - pydocstyle: D103
     - pylint: missing-docstring
+    - pylint: C0111
     - ruff: D103
+    - pep257: D103
+    - pydocstyle: D103
 
   - - pylint: singleton-comparison
+    - pylint: C0221
     - pep8: E711
     - pycodestyle: E711
 
   - - pylint: subprocess-run-check
-    - bandit: B603
+    - pylint: W1510
     - ruff: S603
     - ruff: PLW1510
+    - bandit: B603
 
   - # Private member accessed:
     - pylint: protected-access
+    - pylint: W0212
     - ruff: SLF001
 
   # assert_used
@@ -418,6 +477,7 @@ combinations:
 
   # request_without_timeout
   - - pylint: missing-timeout
+    - pylint: W3101
     - ruff: S113
     - bandit: B113
 
@@ -528,13 +588,15 @@ combinations:
   # Within an `except` clause, raise exceptions with `raise ... from err` or `raise ... from None` to distinguish them from errors in exception handling
   # See: https://docs.astral.sh/ruff/rules/raise-without-from-inside-except
   - - pylint: raise-missing-from
+    - pylint: W0707
     - ruff: B904
 
   # Use of possibly insecure function - consider using safer ast.literal_eval
   # See: https://docs.astral.sh/ruff/rules/suspicious-eval-usage
   - - pylint: eval-used
-    - bandit: B307
+    - pylint: W0123
     - ruff: S307
+    - bandit: B307
 
   - # {kind} name "{param_name}" does not reflect its {variance}; consider renaming it to "{replacement_name}"
     - pylint: type-name-incorrect-variance
@@ -1081,6 +1143,11 @@ combinations:
     - pylint: W3301
     - ruff: PLW3301
 
+  - # Consider using 'with' for resource-allocating operations
+    - pylint: consider-using-with
+    - pylint: R1732
+    - ruff: SIM115
+
   - # Missing docstring in public package
     - ruff: D104
     - pycodestyle: D104

prospector/config/configuration.py

@@ -127,7 +127,7 @@ def build_command_line_source(
         "uses": {
             "flags": ["-u", "--uses"],
             "help": "A list of one or more libraries or frameworks that the"
-            " project uses. Possible values are: django, celery, flask. This will be"
+            " project uses. Possible values are: django, celery. This will be"
             " autodetected by default, but if autodetection doesn't"
             " work, manually specify them using this flag.",
         },

prospector/formatters/base_summary.py

@@ -1,4 +1,9 @@
+import os
+from pathlib import Path
+from typing import Optional
+
 from prospector.formatters.base import Formatter
+from prospector.message import Location, Message
 
 
 class SummaryFormatter(Formatter):
@@ -41,3 +46,45 @@ class SummaryFormatter(Formatter):
         output = ["Profile", "=======", "", self.profile.as_yaml().strip()]
 
         return "\n".join(output)
+
+    def get_ci_annotation(self, message: Message) -> Optional[str]:
+        intro = (
+            f"({message.source})"
+            if message.code is None
+            else f"{message.code}({message.source})"
+            if message.location.function is None
+            else f"[{message.code}({message.source}), {message.location.function}]"
+        )
+        ci_prefix = self._get_ci_prefix(message.location, intro)
+        if ci_prefix:
+            github_message = f"{ci_prefix}{intro}%0A{message.message.strip()}"
+            if message.doc_url:
+                github_message += f"%0ASee: {message.doc_url}"
+            return github_message
+        return None
+
+    def _get_ci_prefix(self, location: Location, title: str) -> Optional[str]:
+        if location.path is None:
+            return None
+        if os.environ.get("GITHUB_ACTIONS") == "true":
+            path = location.path
+            if "PROSPECTOR_FILE_PREFIX" in os.environ:
+                path = Path(os.environ["PROSPECTOR_FILE_PREFIX"]) / path
+            # pylint: disable-next=line-too-long
+            # See: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions#setting-an-error-message
+            parameters = {
+                "file": path,
+                "line": location.line,
+                "title": title,
+            }
+            if location.line_end:
+                parameters["endLine"] = location.line_end
+            if location.character:
+                parameters["col"] = location.character
+            if location.character_end:
+                parameters["endColumn"] = location.character_end
+
+            parameters_str = ",".join(f"{key}={value}" for key, value in parameters.items())
+            return f"::error {parameters_str}::"
+
+        return None

prospector/formatters/pylint.py

@@ -52,18 +52,23 @@ class PylintFormatter(SummaryFormatter):
             message_str = message.message.strip()
             if message.doc_url:
                 message_str += f" (See: {message.doc_url})"
-            output.append(
-                template
-                % {
-                    "path": self._make_path(message.location),
-                    "line": message.location.line,
-                    "character": message.location.character,
-                    "source": message.source,
-                    "code": message.code,
-                    "function": message.location.function,
-                    "message": message.message.strip(),
-                }
-            )
+            template_args = {
+                "path": self._make_path(message.location),
+                "line": message.location.line,
+                "character": message.location.character,
+                "source": message.source,
+                "code": message.code,
+                "function": message.location.function,
+                "message": message.message.strip(),
+            }
+            output.append(template % template_args)
+            if message.doc_url:
+                template_args["message"] = ""
+                indent = len(template % template_args)
+                output.append(f"{' ' * indent}See: {message.doc_url}")
+            ci_annotation = self.get_ci_annotation(message)
+            if ci_annotation:
+                output.append(ci_annotation)
         return output
 
     def render(self, summary: bool = True, messages: bool = True, profile: bool = False) -> str:

prospector/formatters/text.py

@@ -24,6 +24,9 @@ class TextFormatter(SummaryFormatter):
         )
 
         output.append(f"    {message.message}")
+        ci_annotation = self.get_ci_annotation(message)
+        if ci_annotation:
+            output.append(ci_annotation)
 
         return "\n".join(output)
 

prospector/identify.py

@@ -0,0 +1,90 @@
+# Largely inspired by https://github.com/pre-commit/identify/blob/main/identify/identify.py#L178
+
+import errno
+import os
+import shlex
+import string
+from pathlib import Path
+from typing import IO
+
+printable = frozenset(string.printable)
+
+
+def _shebang_split(line: str) -> tuple[str, ...]:
+    try:
+        # shebangs aren't supposed to be quoted, though some tools such as
+        # setuptools will write them with quotes so we'll best-guess parse
+        # with shlex first
+        return tuple(shlex.split(line))
+    except ValueError:
+        # failing that, we'll do a more "traditional" shebang parsing which
+        # just involves splitting by whitespace
+        return tuple(line.split())
+
+
+def _parse_nix_shebang(
+    bytes_io: IO[bytes],
+    cmd: tuple[str, ...],
+) -> tuple[str, ...]:
+    while bytes_io.read(2) == b"#!":
+        next_line_b = bytes_io.readline()
+        try:
+            next_line = next_line_b.decode("UTF-8")
+        except UnicodeDecodeError:
+            return cmd
+
+        for c in next_line:
+            if c not in printable:
+                return cmd
+
+        line_tokens = _shebang_split(next_line.strip())
+        for i, token in enumerate(line_tokens[:-1]):
+            if token != "-i":  # noqa: S105
+                continue
+            # The argument to -i flag
+            cmd = (line_tokens[i + 1],)
+    return cmd
+
+
+def _parse_shebang(bytes_io: IO[bytes]) -> tuple[str, ...]:
+    """Parse the shebang from a file opened for reading binary."""
+    if bytes_io.read(2) != b"#!":
+        return ()
+    first_line_b = bytes_io.readline()
+    try:
+        first_line = first_line_b.decode("UTF-8")
+    except UnicodeDecodeError:
+        return ()
+
+    # Require only printable ascii
+    for c in first_line:
+        if c not in printable:
+            return ()
+
+    cmd = _shebang_split(first_line.strip())
+    if cmd[:2] == ("/usr/bin/env", "-S"):
+        cmd = cmd[2:]
+    elif cmd[:1] == ("/usr/bin/env",):
+        cmd = cmd[1:]
+
+    if cmd == ("nix-shell",):
+        return _parse_nix_shebang(bytes_io, cmd)
+
+    return cmd
+
+
+def parse_shebang_from_file(path: Path) -> tuple[str, ...]:
+    """Parse the shebang given a file path."""
+    if not path.exists():
+        return ()
+    if not os.access(path, os.X_OK):
+        return ()
+
+    try:
+        with path.open("rb") as f:
+            return _parse_shebang(f)
+    except OSError as e:
+        if e.errno == errno.EINVAL:
+            return ()
+        else:
+            raise

prospector/pathutils.py

@@ -1,14 +1,28 @@
+import mimetypes
 import os
+import re
 from pathlib import Path
 
+from prospector import identify
+
+_PYTHON_COMMAND_RE = re.compile(r"^python[0-9]?$")
+
 
 def is_python_package(path: Path) -> bool:
     return path.is_dir() and (path / "__init__.py").exists()
 
 
 def is_python_module(path: Path) -> bool:
-    # TODO: is this too simple?
-    return path.suffix == ".py"
+    mimetype, encoding = mimetypes.guess_type(path)
+    del encoding
+    if mimetype == "text/x-python":
+        return True
+
+    executor = identify.parse_shebang_from_file(path)
+    if executor is not None and len(executor) > 0:
+        return _PYTHON_COMMAND_RE.match(Path(executor[0]).name) is not None
+
+    return False
 
 
 def is_virtualenv(path: Path) -> bool:

prospector/profiles/profile.py

@@ -26,7 +26,7 @@ class ProspectorProfile:
         self.output_target = profile_dict.get("output-target")
         self.autodetect = profile_dict.get("autodetect", True)
         self.uses = [
-            uses for uses in _ensure_list(profile_dict.get("uses", [])) if uses in ("django", "celery", "flask")
+            uses for uses in _ensure_list(profile_dict.get("uses", [])) if uses in ("django", "celery")
         ]
         self.max_line_length = profile_dict.get("max-line-length")
 
@@ -133,7 +133,10 @@ def _load_content_package(name: str) -> Optional[dict[str, Any]]:
     used_name = None
     for file_name in file_names:
         used_name = f"{module_name}:{file_name}"
-        data = pkgutil.get_data(module_name, file_name)
+        try:
+            data = pkgutil.get_data(module_name, file_name)
+        except (ModuleNotFoundError, FileNotFoundError):
+            continue
         if data is not None:
             break
 

prospector/suppression.py

@@ -174,8 +174,8 @@ def get_suppressions(
             for line_number, line_content in enumerate(file_contents):
                 for tool_name, tool in tools.items():
                     tool_ignores = tool.get_ignored_codes(line_content)
-                    for tool_ignore in tool_ignores:
-                        tools_ignore[filepath][line_number + 1].add(Ignore(tool_name, tool_ignore))
+                    for tool_ignore, offset in tool_ignores:
+                        tools_ignore[filepath][line_number + 1 + offset].add(Ignore(tool_name, tool_ignore))
 
     # Ignore the blending messages
     if blending:

prospector/tools/base.py

@@ -44,9 +44,9 @@ class ToolBase(ABC):
         """
         raise NotImplementedError
 
-    def get_ignored_codes(self, line: str) -> list[str]:
+    def get_ignored_codes(self, line: str) -> list[tuple[str, int]]:
         """
-        Return a list of error codes that the tool will ignore from a line of code.
+        Return a list of error codes and line offset that the tool will ignore from a line of code.
         """
         del line  # unused
         return []

prospector/tools/mypy/__init__.py

@@ -154,8 +154,8 @@ class MypyTool(ToolBase):
 
         return messages
 
-    def get_ignored_codes(self, line: str) -> list[str]:
+    def get_ignored_codes(self, line: str) -> list[tuple[str, int]]:
         match = _IGNORE_RE.search(line)
         if match:
-            return [e.strip() for e in match.group(1).split(",")]
+            return [(e.strip(), 0) for e in match.group(1).split(",")]
         return []

prospector/tools/profile_validator/__init__.py

@@ -123,7 +123,7 @@ class ProfileValidationTool(ToolBase):
                 )
 
         if "uses" in parsed:
-            possible_libs = ("django", "celery", "flask")
+            possible_libs = ("django", "celery")
             parsed_list = parsed["uses"] if isinstance(parsed["uses"], list) else [parsed["uses"]]
             for uses in parsed_list:
                 if uses not in possible_libs:

prospector/tools/pylint/__init__.py

@@ -22,6 +22,7 @@ if TYPE_CHECKING:
 _UNUSED_WILDCARD_IMPORT_RE = re.compile(r"^Unused import(\(s\))? (.*) from wildcard import")
 
 _IGNORE_RE = re.compile(r"#\s*pylint:\s*disable=([^#]*[^#\s])(\s*#.*)?$", re.IGNORECASE)
+_IGNORE_NEXT_RE = re.compile(r"#\s*pylint:\s*disable-next=([^#]*[^#\s])(\s*#.*)?$", re.IGNORECASE)
 
 
 def _is_in_dir(subpath: Path, path: Path) -> bool:
@@ -46,8 +47,6 @@ class PylintTool(ToolBase):
             linter.load_plugin_modules(["pylint_django"])
         if "celery" in prospector_config.libraries:
             linter.load_plugin_modules(["pylint_celery"])
-        if "flask" in prospector_config.libraries:
-            linter.load_plugin_modules(["pylint_flask"])
 
         profile_path = os.path.join(prospector_config.workdir, prospector_config.profile.name)
         for plugin in prospector_config.profile.pylint.get("load-plugins", []):  # type: ignore[attr-defined]
@@ -269,8 +268,11 @@ class PylintTool(ToolBase):
         messages = self._collector.get_messages()
         return self.combine(messages)
 
-    def get_ignored_codes(self, line: str) -> list[str]:
+    def get_ignored_codes(self, line: str) -> list[tuple[str, int]]:
         match = _IGNORE_RE.search(line)
         if match:
-            return [e.strip() for e in match.group(1).split(",")]
+            return [(e.strip(), 0) for e in match.group(1).split(",")]
+        match = _IGNORE_NEXT_RE.search(line)
+        if match:
+            return [(e.strip(), 1) for e in match.group(1).split(",")]
         return []

prospector/tools/ruff/__init__.py

@@ -88,8 +88,8 @@ class RuffTool(ToolBase):
             )
         return messages
 
-    def get_ignored_codes(self, line: str) -> list[str]:
+    def get_ignored_codes(self, line: str) -> list[tuple[str, int]]:
         match = PEP8_IGNORE_LINE_CODE.search(line)
         if match:
-            return [e.strip() for e in match.group(1).split(",")]
+            return [(e.strip(), 0) for e in match.group(1).split(",")]
         return []

{prospector-1.15.2.dist-info → prospector-1.15.4a1.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: prospector
-Version: 1.15.2
+Version: 1.15.4a1
 Summary: Prospector is a tool to analyse Python code by aggregating the result of other tools.
-Home-page: http://prospector.readthedocs.io
 License: GPLv2+
 Keywords: pylint,prospector,static code analysis
 Author: Carl Crowder
@@ -19,25 +18,23 @@ Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Topic :: Software Development :: Quality Assurance
-Provides-Extra: with_bandit
-Provides-Extra: with_everything
-Provides-Extra: with_mypy
-Provides-Extra: with_pyright
-Provides-Extra: with_pyroma
-Provides-Extra: with_ruff
-Provides-Extra: with_vulture
+Provides-Extra: with-bandit
+Provides-Extra: with-everything
+Provides-Extra: with-mypy
+Provides-Extra: with-pyright
+Provides-Extra: with-pyroma
+Provides-Extra: with-ruff
+Provides-Extra: with-vulture
 Requires-Dist: GitPython (>=3.1.27,<4.0.0)
 Requires-Dist: PyYAML
-Requires-Dist: bandit (>=1.5.1); extra == "with_bandit" or extra == "with_everything"
+Requires-Dist: bandit (>=1.5.1) ; extra == "with-bandit" or extra == "with-everything"
 Requires-Dist: dodgy (>=0.2.1,<0.3.0)
 Requires-Dist: mccabe (>=0.7.0,<0.8.0)
-Requires-Dist: mypy (>=0.600); extra == "with_mypy" or extra == "with_everything"
+Requires-Dist: mypy (>=0.600) ; extra == "with-mypy" or extra == "with-everything"
 Requires-Dist: packaging
 Requires-Dist: pep8-naming (>=0.3.3,<=0.10.0)
 Requires-Dist: pycodestyle (>=2.9.0)
@@ -46,14 +43,14 @@ Requires-Dist: pyflakes (>=2.2.0)
 Requires-Dist: pylint (>=3.0)
 Requires-Dist: pylint-celery (==0.3)
 Requires-Dist: pylint-django (>=2.6.1)
-Requires-Dist: pylint-flask (==0.6)
-Requires-Dist: pyright (>=1.1.3); extra == "with_pyright" or extra == "with_everything"
-Requires-Dist: pyroma (>=2.4); extra == "with_pyroma" or extra == "with_everything"
+Requires-Dist: pyright (>=1.1.3) ; extra == "with-pyright" or extra == "with-everything"
+Requires-Dist: pyroma (>=2.4) ; extra == "with-pyroma" or extra == "with-everything"
 Requires-Dist: requirements-detector (>=1.3.2)
-Requires-Dist: ruff; extra == "with_ruff" or extra == "with_everything"
+Requires-Dist: ruff ; extra == "with-ruff" or extra == "with-everything"
 Requires-Dist: setoptconf-tmp (>=0.3.1,<0.4.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
-Requires-Dist: vulture (>=1.5); extra == "with_vulture" or extra == "with_everything"
+Requires-Dist: vulture (>=1.5) ; extra == "with-vulture" or extra == "with-everything"
+Project-URL: Homepage, http://prospector.readthedocs.io
 Project-URL: Repository, https://github.com/PyCQA/prospector
 Description-Content-Type: text/x-rst
 

{prospector-1.15.2.dist-info → prospector-1.15.4a1.dist-info}/RECORD

@@ -1,33 +1,34 @@
 prospector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prospector/__main__.py,sha256=-gdHYZxwq_P8er7HuZEBImY0pwaFq8uIa78dQdJsTTQ,71
-prospector/autodetect.py,sha256=Ok8S6jpDiGyhQlnRCMWpsLpSAIXWxA-NQphQuPaOm6o,3112
+prospector/autodetect.py,sha256=sUcayzZjLGESxoPDN_t4_amOAnh9bwKX-9ANBlprP8k,3103
 prospector/blender.py,sha256=ldQSkfoEKv6pd72B9YCYdapeGUzgfhGzieAu7To3l6Y,4926
-prospector/blender_combinations.yaml,sha256=Cr0YAwsGKTy095GO8ktMXqCLUWwq3i3Za1Bu34JR-sI,30949
+prospector/blender_combinations.yaml,sha256=BD2mp4wjb2IRl08kAFBGUmk416WcUSeu-KcBwBII3_Y,32370
 prospector/compat.py,sha256=p_2BOebzUcKbUAd7mW8rn6tIc10R96gJuZS71QI0XY4,360
 prospector/config/__init__.py,sha256=4nYshBncKUvZrwNKmp2bQ2mQ8uRS7GU20xPbiC-nJ9g,14793
-prospector/config/configuration.py,sha256=sNYR5Jc3P7tfIDXQoDMrOX4i2Yde0o9bc21ZXZNn6rw,14046
+prospector/config/configuration.py,sha256=fPSmyBPCOb-JvkOh2QMe0PfTdIHsy6V5plagI0d_vaU,14039
 prospector/config/datatype.py,sha256=u2i3YxtFKXkeGKzrYnc8koI-Xq-Owl74e_XveNhFY8Y,658
 prospector/encoding.py,sha256=67sbqzcUoQqi3PRm_P3GNGwcL1N56RZ3T_YHmSrICEE,1549
 prospector/exceptions.py,sha256=3P58RNF7j1n4CUIZ8VM5BVhB4Q6UtVs-dQRG8TRCZ7o,1248
 prospector/finder.py,sha256=pmGuxf9Jq5SX1ANHHdnFKLDfFwTk4fKakxnFHuwzpvs,4775
 prospector/formatters/__init__.py,sha256=Ko96rZA7C0vjWdsU80DHdHoCk8PNjfDEQI-AACs3_CI,552
 prospector/formatters/base.py,sha256=f3ku_wbFDk_woCPS15FvLDFQBSw8Bxf9Wytuz8vdplc,1883
-prospector/formatters/base_summary.py,sha256=C2O6XAU4l-rOHL1q4rA56jO9sU7Sf0sHRvqgiY6PQgw,1410
+prospector/formatters/base_summary.py,sha256=mLV2Tw68vFAcljeYT9xH87EXoUXiQgOW5mrWRIeKLOU,3353
 prospector/formatters/emacs.py,sha256=lDOxDJSYYLV1gzevO_z7NlM4AUH6JC9EwoEZu6knnqs,724
 prospector/formatters/grouped.py,sha256=-vD8I3unoO0FBISoUPHZPCa0p-btWMvt1D_UxzmcGDA,1357
 prospector/formatters/json.py,sha256=_DbZ_Eb0fmZf6qZMXCU__QRXv_awkBisZ-jvGfOr4aw,1000
-prospector/formatters/pylint.py,sha256=uotSwdXb0eSey4cltbvGVfOVi6bZcb4c7XebfkcexLU,3027
+prospector/formatters/pylint.py,sha256=Tq_x_9YoIUR7XDat2eknL7CQIMqTU6rViFoQ4GeEIQg,3330
 prospector/formatters/pylint_parseable.py,sha256=o80NQZjPqKIHVfywJTci4ky_FzP4XlPa6ZSXoVPPxnY,2724
-prospector/formatters/text.py,sha256=5czha8YfdJ9SD6vWLHE85LgB3-d0lHOsxpYhtokRmTU,1611
+prospector/formatters/text.py,sha256=poq8mQF7GIULnS6phqSGS5WW5w796zSCmWAeqp9FHwM,1734
 prospector/formatters/vscode.py,sha256=ffP-JmrgZhhdirTj1ldV5fG10hdDiHjRfekSqQpQmx0,1643
 prospector/formatters/xunit.py,sha256=e5ObAWSLm-ekvWs8xsi-OaIL2yoYedlxuJdUhLZ8gkk,2464
 prospector/formatters/yaml.py,sha256=0RAL5BaaL9A0DfWZ-bdpK1mwgr8zJ_ULVwlnSXVPlDU,684
+prospector/identify.py,sha256=EKDD5gGIArN6Gf0FPAgO7bOqUe1wvGH3xNjDcymPoyA,2474
 prospector/message.py,sha256=HKXdO8bOezRKSnTtjqu0k04Cb7JgL0oPUWakuSBE9s4,3710
-prospector/pathutils.py,sha256=CyZIj4WXGill8OfnqRvcVqZYX0lzL3QcIxpkxCz-dkE,1219
+prospector/pathutils.py,sha256=D43-p3eBS8oM_XIdlrAfUvaFIewEf7zkaM84cjY5-mE,1592
 prospector/postfilter.py,sha256=BpmR1g1ZlgQB92_Uk6hRyYoIBUcivvcU8RGLUHXDdcU,2695
 prospector/profiles/__init__.py,sha256=q9zPLVEwo7qoouYFrmENsmByFrKKkr27Dd_Wo9btTJI,683
 prospector/profiles/exceptions.py,sha256=MDky4KXVwfOlW1yCbyp8Y07D8Kfz76jL3z-8T3WQIFI,1062
-prospector/profiles/profile.py,sha256=U8vDdyfka0_Ht9cYT2i_c-xbMcktSpS1h53cU7tGerk,17828
+prospector/profiles/profile.py,sha256=iX9krQ-Pp0Zr2b0udEAvIo8MH0LrEMmq1GgrIAufIaY,17914
 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
@@ -45,28 +46,28 @@ prospector/profiles/profiles/strictness_veryhigh.yaml,sha256=whQFEUtkySSEIriEwYO
 prospector/profiles/profiles/strictness_verylow.yaml,sha256=YxZowcBtA3tAaHJGz2htTdAJ-AXmlHB-o4zEYKPRfJg,833
 prospector/profiles/profiles/test_warnings.yaml,sha256=arUcV9MnqiZJEHURH9bVRSYDhYUegNc-ltFYe_yQW44,23
 prospector/run.py,sha256=Sjh28jI-Bergzr3rxZp7QzRHP9Ue0SPdfcB0TEkMSDQ,8631
-prospector/suppression.py,sha256=qT3TIe8a87mnXPOcRr6m58UodUREExBZxttTlWFTJbY,7654
+prospector/suppression.py,sha256=TbJCl2i5CyEszkrOMMflSSKJUtZkysy0AKv8MqPuy1g,7671
 prospector/tools/__init__.py,sha256=9tDmxL_kn5jmAACeSi1jtSvT-9tI468Ccn1Up2wUFi0,2956
 prospector/tools/bandit/__init__.py,sha256=iU39U28_YP5QUm8sgU21Ps96czIIl6tSV7qtCxbFvms,3035
-prospector/tools/base.py,sha256=xL_uUbhZUyPrDU-2ntgmzhs-DW1e5sfDKb_OA7VtxKQ,2146
+prospector/tools/base.py,sha256=s9reA-prAqNGMf1FaP-_73sptpgt6NXGIwrmKHJu3-I,2174
 prospector/tools/dodgy/__init__.py,sha256=howLCjFEheW_6ZoyQ15gLbiNNNUr0Pm2qNpLg3kleFY,1648
 prospector/tools/exceptions.py,sha256=Q-u4n6YzZuoMu17XkeKac1o1gBY36JK4MnvWaYrVYL0,170
 prospector/tools/mccabe/__init__.py,sha256=80-aYPqKCREeBqxiIUgsDvxc_GqYxHb5R0JduKHPRaE,3277
-prospector/tools/mypy/__init__.py,sha256=MLFBEnICTsLNO2piwRbcrWIv12ddgIqnQSuq43CRGTc,5350
-prospector/tools/profile_validator/__init__.py,sha256=bAkVG-fKtm3WaEv-We36wqzvtqWv4s06Z7YnRVG7UQ4,8326
+prospector/tools/mypy/__init__.py,sha256=JxczQoHYdUNFLunhvtMSs7MkW7sL92pOoqSY_WI2wVs,5367
+prospector/tools/profile_validator/__init__.py,sha256=CrQeWfbnKav3xlcY2A14Ld_v-9KE5Yz5HJNtTmrST8c,8317
 prospector/tools/pycodestyle/__init__.py,sha256=uMpUxqsPsryEsfyfGxpLzwoWUjIvfxIQke4Xvkfbi9A,5970
 prospector/tools/pydocstyle/__init__.py,sha256=WB-AT-c1FeUUUWATUzJbBLeREtu-lxT03bChh4nablo,2776
 prospector/tools/pyflakes/__init__.py,sha256=53NQFODU416KO991NxW14gChjagbSAhhfErx1ll7VUQ,5631
-prospector/tools/pylint/__init__.py,sha256=Nixin4odPsTj7q1C2Tud2mU5An1lCc7aKQdGAQLyf8g,11398
+prospector/tools/pylint/__init__.py,sha256=MwvKY8ESvlD3FXa6GgZ5JB0ALzWRV60LVbX2RxsrzLM,11540
 prospector/tools/pylint/collector.py,sha256=7FHgO6OOLGD15_U4DERiXyEbSFnMjGUBeCwdmUlhO8I,1559
 prospector/tools/pylint/linter.py,sha256=YQ9SOna4WjbbauqSgUio6Ss8zN08PCr3aKdK9rMi7Ag,2143
 prospector/tools/pyright/__init__.py,sha256=USqauZofh-8ZSKGwXRXoaM2ItzfSFo2nGwPtLGEWICU,3346
 prospector/tools/pyroma/__init__.py,sha256=GPQRJZfbs_SI0RBTyySz-4SIuM__YoLfXAm7uYVXAS8,3151
-prospector/tools/ruff/__init__.py,sha256=r55pEbmjLFWmY1jiQ7aZ2OYBxkEAH5An3-CpL04rdc0,3915
+prospector/tools/ruff/__init__.py,sha256=vQLBI7PvrnKIUVbi3XKSES6mH5UUz99X2QNBk3QAIAI,3932
 prospector/tools/utils.py,sha256=cRCogsMCH0lPBhdujPsIY0ovNAL6TAxBMohZRES02-4,1770
 prospector/tools/vulture/__init__.py,sha256=eaTh4X5onNlBMuz1x0rmcRn7x5XDVDgqftjIEd47eWI,3583
-prospector-1.15.2.dist-info/entry_points.txt,sha256=SxvCGt8MJTEZefHAvwnUc6jDetgCaaYY1Zpifuk8tqU,50
-prospector-1.15.2.dist-info/LICENSE,sha256=WoTRadDy8VbcIKoVzl5Q1QipuD_cexAf3ul4MaVLttc,18044
-prospector-1.15.2.dist-info/WHEEL,sha256=gSF7fibx4crkLz_A-IKR6kcuq0jJ64KNCkG8_bcaEao,88
-prospector-1.15.2.dist-info/METADATA,sha256=nqGJNXbYx4ygQlRYWmuYYgOui8Zk9PhsA90WKIejqyk,9962
-prospector-1.15.2.dist-info/RECORD,,
+prospector-1.15.4a1.dist-info/LICENSE,sha256=WoTRadDy8VbcIKoVzl5Q1QipuD_cexAf3ul4MaVLttc,18044
+prospector-1.15.4a1.dist-info/METADATA,sha256=aGqdN09IQoh1yHMiRcA3oeXzpc-TVyY2XMKwF0Eqf-o,9845
+prospector-1.15.4a1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+prospector-1.15.4a1.dist-info/entry_points.txt,sha256=SxvCGt8MJTEZefHAvwnUc6jDetgCaaYY1Zpifuk8tqU,50
+prospector-1.15.4a1.dist-info/RECORD,,

{prospector-1.15.2.dist-info → prospector-1.15.4a1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.2.0
+Generator: poetry-core 2.1.1
 Root-Is-Purelib: true
 Tag: py3-none-any