pytest-revealtype-injector 0.6.1__tar.gz → 0.6.3__tar.gz

{pytest_revealtype_injector-0.6.1 → pytest_revealtype_injector-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-revealtype-injector
-Version: 0.6.1
+Version: 0.6.3
 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>
@@ -22,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Testing
 Classifier: Typing :: Typed
 Requires-Python: >=3.10
-Requires-Dist: pytest<9,>=7.0
-Requires-Dist: schema==0.7.7
+Requires-Dist: pytest>=7.0
+Requires-Dist: schema>=0.7.8
 Requires-Dist: typeguard>=4.3
 Requires-Dist: typing-extensions>=4.0; python_version < '3.11'
 Description-Content-Type: text/markdown

{pytest_revealtype_injector-0.6.1 → pytest_revealtype_injector-0.6.3}/pyproject.toml

@@ -16,10 +16,9 @@ license = 'MIT'
 license-files = ['COPYING*']
 dependencies = [
     'typing_extensions >= 4.0; python_version < "3.11"',
-    'pytest >=7.0,<9',
+    'pytest >=7.0',
     'typeguard >= 4.3',
-    # schema with annotation support is still unreleased
-    'schema == 0.7.7',
+    'schema >= 0.7.8',
 ]
 keywords = [
     'pytest',
@@ -74,13 +73,11 @@ packages = ["src/pytest_revealtype_injector"]
 typeCheckingMode = 'strict'
 enableTypeIgnoreComments = false
 deprecateTypingAliases = true
-reportMissingTypeStubs = false
 
 [tool.mypy]
 mypy_path = "$MYPY_CONFIG_FILE_DIR/src"
 packages = "pytest_revealtype_injector"
 strict = true
-ignore_missing_imports = true
 
 [tool.ruff]
 target-version = "py312"
@@ -128,6 +125,7 @@ pythonpath = [
 # and never does any permanent change with it
 [tool.semantic_release]
 version_variables = ['src/pytest_revealtype_injector/__init__.py:__version__']
+allow_zero_version = true  # switch off for 1.0.0
 major_on_zero = false  # switch on for 1.0.0
 
 [tool.semantic_release.changelog]

{pytest_revealtype_injector-0.6.1 → pytest_revealtype_injector-0.6.3}/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.6.1"
+__version__ = "0.6.3"

{pytest_revealtype_injector-0.6.1 → pytest_revealtype_injector-0.6.3}/src/pytest_revealtype_injector/adapter/mypy_.py

@@ -136,6 +136,25 @@ class NameCollector(NameCollectorBase):
         return node
 
 
+# Mypy can insert extra character into expression so that it
+# becomes invalid and unparsable. 0.9x days there
+# was '*', and now '?' (and '=' for typeddict too).
+# Instead of globally throwing them away (and causing
+# literal string constants to not match), we iteratively
+# remove chars one by one only where parsing error occurs.
+#
+def _strip_unwanted_char(input: str) -> str:
+    result = input
+    while True:
+        try:
+            _ = ast.parse(result)
+        except SyntaxError as e:
+            assert e.offset is not None
+            result = result[:e.offset-1] + result[e.offset:]
+        else:
+            return result
+
+
 class MypyAdapter(TypeCheckerAdapter):
     id = "mypy"
     _executable = ""  # unused, calls mypy.api.run() here
@@ -212,12 +231,7 @@ class MypyAdapter(TypeCheckerAdapter):
                 )
             if (m := self._type_mesg_re.fullmatch(diag["message"])) is None:
                 continue
-            # Mypy can insert extra character into expression so that it
-            # becomes invalid and unparsable. 0.9x days there
-            # was '*', and now '?' (and '=' for typeddict too).
-            # Try stripping those character and pray we get something
-            # usable for evaluation
-            expression = m["type"].translate({ord(c): None for c in "*?="})
+            expression = _strip_unwanted_char(m["type"])
             try:
                 # Unlike pyright, mypy output doesn't contain variable name
                 self.typechecker_result[pos] = VarType(None, ForwardRef(expression))

{pytest_revealtype_injector-0.6.1 → pytest_revealtype_injector-0.6.3}/src/pytest_revealtype_injector/hooks.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import functools
 import inspect
+from collections.abc import Iterator
 from typing import cast
 
 import pytest
@@ -14,7 +15,8 @@ _logger = log.get_logger()
 adapter_stash_key: pytest.StashKey[set[TypeCheckerAdapter]]
 
 
-def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> None:
+@pytest.hookimpl(wrapper=True)
+def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> Iterator[None]:
     assert pyfuncitem.module is not None
     adp_stash = pyfuncitem.config.stash[adapter_stash_key]
 
@@ -23,7 +25,7 @@ def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> None:
     if mark:
         disabled_adapters = {a.id for a in adp_stash if a.id in mark.args}
         for a in disabled_adapters:
-            _logger.info(f"{a} adapter disabled by 'notypechecker' marker")
+            _logger.info(f"{a} adapter disabled by 'notypechecker' marker in {pyfuncitem.name} test")
         adapters = {a for a in adp_stash if a.id not in disabled_adapters}
     else:
         adapters = {a for a in adp_stash}
@@ -31,39 +33,43 @@ def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> None:
     if not adapters:
         pytest.fail("All type checkers have been disabled.")
 
-    # Replace reveal_type() with our own function
-    for name in dir(pyfuncitem.module):
-        if name.startswith("__") or name.startswith("@py"):
-            continue
-
-        item = getattr(pyfuncitem.module, name)
-        if inspect.isfunction(item):
-            if item.__name__ != "reveal_type" or item.__module__ not in {
-                "typing",
-                "typing_extensions",
-            }:
+    # Monkeypatch reveal_type() with our own function, to guarantee
+    # each test func can receive different adapters
+    with pytest.MonkeyPatch.context() as mp:
+        for name in dir(pyfuncitem.module):
+            if name.startswith("__") or name.startswith("@py"):
                 continue
-            injected = functools.partial(
-                revealtype_injector,
-                adapters=adapters,
-                rt_funcname=name,
-            )
-            setattr(pyfuncitem.module, name, injected)
-            _logger.info(f"Replaced {name}() from global import with {injected}")
-            break
 
-        elif inspect.ismodule(item):
-            if item.__name__ not in {"typing", "typing_extensions"}:
-                continue
-            assert hasattr(item, "reveal_type")
-            injected = functools.partial(
-                revealtype_injector,
-                adapters=adapters,
-                rt_funcname=f"{name}.reveal_type",
-            )
-            setattr(item, "reveal_type", injected)
-            _logger.info(f"Replaced {name}.reveal_type() with {injected}")
-            break
+            item = getattr(pyfuncitem.module, name)
+            if inspect.isfunction(item):
+                if item.__name__ != "reveal_type" or item.__module__ not in {
+                    "typing",
+                    "typing_extensions",
+                }:
+                    continue
+                injected = functools.partial(
+                    revealtype_injector,
+                    adapters=adapters,
+                    rt_funcname=name,
+                )
+                mp.setattr(pyfuncitem.module, name, injected)
+                _logger.info(f"Replaced {name}() from global import with {injected} in {pyfuncitem.name} test")
+                break
+
+            elif inspect.ismodule(item):
+                if item.__name__ not in {"typing", "typing_extensions"}:
+                    continue
+                assert hasattr(item, "reveal_type")
+                injected = functools.partial(
+                    revealtype_injector,
+                    adapters=adapters,
+                    rt_funcname=f"{name}.reveal_type",
+                )
+                mp.setattr(item, "reveal_type", injected)
+                _logger.info(f"Replaced {name}.reveal_type() with {injected} in {pyfuncitem.name} test")
+                break
+
+        return cast(None, (yield))  # type: ignore[redundant-cast]
 
 
 def pytest_collection_finish(session: pytest.Session) -> None: