pytest-revealtype-injector 0.3.0__tar.gz → 0.4.1__tar.gz

{pytest_revealtype_injector-0.3.0 → pytest_revealtype_injector-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-revealtype-injector
-Version: 0.3.0
+Version: 0.4.1
 Summary: Pytest plugin for replacing reveal_type() calls inside test functions with static and runtime type checking result comparison, for confirming type annotation validity.
 Project-URL: homepage, https://github.com/abelcheung/pytest-revealtype-injector
 Author-email: Abel Cheung <abelcheung@gmail.com>
@@ -27,6 +27,7 @@ Requires-Dist: pyright>=1.1
 Requires-Dist: pytest<9,>=7.0
 Requires-Dist: schema==0.7.7
 Requires-Dist: typeguard>=4.3
+Requires-Dist: typing-extensions>=4.0; python_version < '3.11'
 Description-Content-Type: text/markdown
 
 ![PyPI - Version](https://img.shields.io/pypi/v/pytest-revealtype-injector)

{pytest_revealtype_injector-0.3.0 → pytest_revealtype_injector-0.4.1}/pyproject.toml

@@ -15,6 +15,7 @@ requires-python = '>=3.10'
 license = 'MIT'
 license-files = ['COPYING*']
 dependencies = [
+    'typing_extensions >= 4.0; python_version < "3.11"',
     'mypy >= 1.11.2',
     'pyright >= 1.1',
     'basedpyright >= 1.0',

{pytest_revealtype_injector-0.3.0 → pytest_revealtype_injector-0.4.1}/src/pytest_revealtype_injector/__init__.py

@@ -1,3 +1,3 @@
 """Pytest plugin for replacing reveal_type() calls inside test functions with static and runtime type checking result comparison, for confirming type annotation validity."""  # noqa: E501
 
-__version__ = "0.3.0"
+__version__ = "0.4.1"

{pytest_revealtype_injector-0.3.0 → pytest_revealtype_injector-0.4.1}/src/pytest_revealtype_injector/adapter/__init__.py

@@ -13,6 +13,7 @@ def generate() -> set[TypeCheckerAdapter]:
         mypy_.generate_adapter(),
     }
 
+
 def get_adapter_classes() -> list[type[TypeCheckerAdapter]]:
     return [
         basedpyright_.BasedPyrightAdapter,

{pytest_revealtype_injector-0.3.0 → pytest_revealtype_injector-0.4.1}/src/pytest_revealtype_injector/adapter/mypy_.py

@@ -143,7 +143,7 @@ class MypyAdapter(TypeCheckerAdapter):
         "column": int,
         "message": str,
         "hint": s.Or(str, s.Schema(None)),
-        "code": str,
+        "code": s.Or(str, s.Schema(None)),
         "severity": s.Or(
             s.Schema("note"),
             s.Schema("warning"),
@@ -199,11 +199,12 @@ class MypyAdapter(TypeCheckerAdapter):
             # but not mypy.api.run(), as of 1.13.
             if diag["severity"] != "note":
                 raise TypeCheckerError(
-                    "Mypy {} with exit code {}: {}".format(
-                        diag["severity"], returncode, diag["message"]
+                    "{} {} with exit code {}: {}".format(
+                        self.id, diag["severity"], returncode, diag["message"]
                     ),
                     diag["file"],
                     diag["line"],
+                    diag["code"],
                 )
             if (m := self._type_mesg_re.fullmatch(diag["message"])) is None:
                 continue

{pytest_revealtype_injector-0.3.0 → pytest_revealtype_injector-0.4.1}/src/pytest_revealtype_injector/adapter/pyright_.py

@@ -6,17 +6,22 @@ import pathlib
 import re
 import shutil
 import subprocess
+import sys
 from collections.abc import (
     Iterable,
 )
 from typing import (
     ForwardRef,
     Literal,
-    TypedDict,
     TypeVar,
     cast,
 )
 
+if sys.version_info >= (3, 11):
+    from typing import NotRequired, TypedDict
+else:
+    from typing_extensions import NotRequired, TypedDict
+
 import schema as s
 
 from ..log import get_logger
@@ -46,7 +51,7 @@ class _PyrightDiagItem(TypedDict):
     severity: Literal["information", "warning", "error"]
     message: str
     range: _PyrightDiagRange
-
+    rule: NotRequired[str]
 
 class NameCollector(NameCollectorBase):
     type_checker = "pyright"
@@ -139,7 +144,15 @@ class PyrightAdapter(TypeCheckerAdapter):
             lineno = diag["range"]["start"]["line"] + 1
             filename = pathlib.Path(diag["file"]).name
             if proc.returncode:
-                raise TypeCheckerError(diag["message"], filename, lineno)
+                assert "rule" in diag
+                raise TypeCheckerError(
+                    "{} {} with exit code {}: {}".format(
+                        self.id, diag["severity"], proc.returncode, diag["message"]
+                    ),
+                    filename,
+                    lineno,
+                    diag["rule"],
+                )
             if (m := self._type_mesg_re.fullmatch(diag["message"])) is None:
                 continue
             pos = FilePos(filename, lineno)

{pytest_revealtype_injector-0.3.0 → pytest_revealtype_injector-0.4.1}/src/pytest_revealtype_injector/hooks.py

@@ -30,9 +30,7 @@ def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> None:
                 "typing_extensions",
             }:
                 setattr(pyfuncitem.module, name, injected)
-                _logger.info(
-                    f"Replaced {name}() from global import with {injected}"
-                )
+                _logger.info(f"Replaced {name}() from global import with {injected}")
                 continue
 
         if inspect.ismodule(item):
@@ -51,7 +49,7 @@ def pytest_collection_finish(session: pytest.Session) -> None:
             adp.run_typechecker_on(files)
         except Exception as e:
             _logger.error(f"({adp.id}) {e}")
-            raise e
+            pytest.exit(f"({type(e).__name__}) " + str(e), pytest.ExitCode.INTERNAL_ERROR)
         else:
             _logger.info(f"({adp.id}) Type checker ran successfully")
 

{pytest_revealtype_injector-0.3.0 → pytest_revealtype_injector-0.4.1}/src/pytest_revealtype_injector/models.py

@@ -33,16 +33,24 @@ class VarType(NamedTuple):
 
 class TypeCheckerError(Exception):
     # Can be None when type checker dies before any code evaluation
-    def __init__(self, message: str, filename: str | None, lineno: int | None) -> None:
+    def __init__(
+        self,
+        message: str,
+        filename: str | None,
+        lineno: int | None,
+        rule: str | None = None,
+    ) -> None:
         super().__init__(message)
         self._filename = filename
         self._lineno = lineno
+        self._rule = rule
 
     def __str__(self) -> str:
         if self._filename:
-            return '"{}"{}: {}'.format(
+            return '"{}"{}{}: {}'.format(
                 self._filename,
                 " line " + str(self._lineno) if self._lineno else "",
+                ', violating "' + self._rule + '" rule' if self._rule else "",
                 self.args[0],
             )
         else: