pytest-revealtype-injector 0.8.0__tar.gz → 0.9.0__tar.gz

{pytest_revealtype_injector-0.8.0 → pytest_revealtype_injector-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-revealtype-injector
-Version: 0.8.0
+Version: 0.9.0
 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>

{pytest_revealtype_injector-0.8.0 → pytest_revealtype_injector-0.9.0}/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.8.0"
+__version__ = "0.9.0"

{pytest_revealtype_injector-0.8.0 → pytest_revealtype_injector-0.9.0}/src/pytest_revealtype_injector/adapter/pyrefly_.py

@@ -110,10 +110,12 @@ class PyreflyAdapter(TypeCheckerAdapter):
         try:
             report = json.loads(proc.stdout)
         except Exception as e:
-            raise TypeCheckerError(
-                f"Failed to parse pyrefly JSON output: {e}", None, None
-            ) from e
-
+            # pyrefly (circa 0.47.0) appends github text formatted annotation at the end of json output
+            decoder = json.JSONDecoder()
+            report, _ = decoder.raw_decode(proc.stdout.decode())
+            _logger.warning(
+                f"({self.id}) failed to parse json output, extracted partial json: {e}"
+            )
         assert isinstance(report, dict) and "errors" in report
         items = cast(list[_PyreflyDiagItem], report["errors"])
 

{pytest_revealtype_injector-0.8.0 → pytest_revealtype_injector-0.9.0}/src/pytest_revealtype_injector/adapter/ty_.py

@@ -63,7 +63,7 @@ class NameCollector(BareNameCollector):
 class TyAdapter(TypeCheckerAdapter):
     id = "ty"
     _executable = "ty"
-    _type_mesg_re = re.compile(r'Revealed type: `(?P<type>.+?)`')
+    _type_mesg_re = re.compile(r"Revealed type: `(?P<type>.+?)`")
     _namecollector_class = BareNameCollector
     _schema = s.Schema({
         "check_name": str,
@@ -78,8 +78,8 @@ class TyAdapter(TypeCheckerAdapter):
             "path": str,
             "positions": {
                 "begin": {"line": int, "column": int},
-                "end"  : {"line": int, "column": int},
-            }
+                "end": {"line": int, "column": int},
+            },
         },
     })
 
@@ -152,11 +152,12 @@ class TyAdapter(TypeCheckerAdapter):
             filename, lineno = (
                 pathlib.Path(diag["location"]["path"]).name,
                 diag["location"]["positions"]["begin"]["line"],
-            )            
+            )
             if (m := self._type_mesg_re.search(diag["description"])) is None:
                 continue
             pos = FilePos(filename, lineno)
             self.typechecker_result[pos] = VarType(None, ForwardRef(m["type"]))
 
+
 def generate_adapter() -> TypeCheckerAdapter:
-    return TyAdapter()
+    return TyAdapter()

{pytest_revealtype_injector-0.8.0 → pytest_revealtype_injector-0.9.0}/src/pytest_revealtype_injector/hooks.py

@@ -49,7 +49,7 @@ def pytest_pyfunc_call(pyfuncitem: pytest.Function) -> Iterator[None]:
         adapters = {a for a in adp_stash}
 
     if not adapters:
-        pytest.fail("No type checker is enabled.")
+        pytest.skip("No type checker is enabled for this test.")
 
     # Monkeypatch reveal_type() with our own function, to guarantee
     # each test func can receive different adapters

{pytest_revealtype_injector-0.8.0 → pytest_revealtype_injector-0.9.0}/tests/test_marker.py

@@ -62,7 +62,9 @@ class TestOnlyTypeCheckerMarker:
         pytester.makeconftest("pytest_plugins = ['pytest_revealtype_injector.plugin']")
         pytester.makepyprojecttoml(self.PYPROJECT_TOML)
         pytester.makepyfile(  # pyright: ignore[reportUnknownMemberType]
-            self.TEST_CONTENT.replace("# FUNC MARK", "@pytest.mark.onlytypechecker('mypy')")
+            self.TEST_CONTENT.replace(
+                "# FUNC MARK", "@pytest.mark.onlytypechecker('mypy')"
+            )
         )
         result = pytester.runpytest("--tb=short", "-vv")
         result.assert_outcomes(passed=1, failed=2)
@@ -71,7 +73,9 @@ class TestOnlyTypeCheckerMarker:
         pytester.makeconftest("pytest_plugins = ['pytest_revealtype_injector.plugin']")
         pytester.makepyprojecttoml(self.PYPROJECT_TOML)
         pytester.makepyfile(  # pyright: ignore[reportUnknownMemberType]
-            self.TEST_CONTENT.replace("# CLASS MARK", "@pytest.mark.onlytypechecker('mypy')")
+            self.TEST_CONTENT.replace(
+                "# CLASS MARK", "@pytest.mark.onlytypechecker('mypy')"
+            )
         )
         result = pytester.runpytest("--tb=short", "-vv")
         result.assert_outcomes(passed=2, failed=1)
@@ -80,7 +84,9 @@ class TestOnlyTypeCheckerMarker:
         pytester.makeconftest("pytest_plugins = ['pytest_revealtype_injector.plugin']")
         pytester.makepyprojecttoml(self.PYPROJECT_TOML)
         pytester.makepyfile(  # pyright: ignore[reportUnknownMemberType]
-            self.TEST_CONTENT.replace("# GLOBAL MARK", "pytestmark = pytest.mark.onlytypechecker('mypy')")
+            self.TEST_CONTENT.replace(
+                "# GLOBAL MARK", "pytestmark = pytest.mark.onlytypechecker('mypy')"
+            )
         )
         result = pytester.runpytest("--tb=short", "-vv")
         result.assert_outcomes(passed=3, failed=0)
@@ -143,7 +149,9 @@ class TestNoTypeCheckerMarker:
         pytester.makeconftest("pytest_plugins = ['pytest_revealtype_injector.plugin']")
         pytester.makepyprojecttoml(self.PYPROJECT_TOML)
         pytester.makepyfile(  # pyright: ignore[reportUnknownMemberType]
-            self.TEST_CONTENT.replace("# FUNC MARK", "@pytest.mark.notypechecker('mypy')")
+            self.TEST_CONTENT.replace(
+                "# FUNC MARK", "@pytest.mark.notypechecker('mypy')"
+            )
         )
         result = pytester.runpytest("--tb=short", "-vv")
         result.assert_outcomes(passed=1, failed=2)
@@ -152,7 +160,9 @@ class TestNoTypeCheckerMarker:
         pytester.makeconftest("pytest_plugins = ['pytest_revealtype_injector.plugin']")
         pytester.makepyprojecttoml(self.PYPROJECT_TOML)
         pytester.makepyfile(  # pyright: ignore[reportUnknownMemberType]
-            self.TEST_CONTENT.replace("# CLASS MARK", "@pytest.mark.notypechecker('mypy')")
+            self.TEST_CONTENT.replace(
+                "# CLASS MARK", "@pytest.mark.notypechecker('mypy')"
+            )
         )
         result = pytester.runpytest("--tb=short", "-vv")
         result.assert_outcomes(passed=2, failed=1)
@@ -161,11 +171,14 @@ class TestNoTypeCheckerMarker:
         pytester.makeconftest("pytest_plugins = ['pytest_revealtype_injector.plugin']")
         pytester.makepyprojecttoml(self.PYPROJECT_TOML)
         pytester.makepyfile(  # pyright: ignore[reportUnknownMemberType]
-            self.TEST_CONTENT.replace("# GLOBAL MARK", "pytestmark = pytest.mark.notypechecker('mypy')")
+            self.TEST_CONTENT.replace(
+                "# GLOBAL MARK", "pytestmark = pytest.mark.notypechecker('mypy')"
+            )
         )
         result = pytester.runpytest("--tb=short", "-vv")
         result.assert_outcomes(passed=3, failed=0)
 
+
 class TestMarkerConflicts:
     PYPROJECT_TOML = """
     [tool.pyright]
@@ -178,6 +191,7 @@ class TestMarkerConflicts:
     def test_foo() -> None:
         pass
     """
+
     def test_typechecker_exclusive(self, pytester: pytest.Pytester) -> None:
         pytester.makeconftest("pytest_plugins = ['pytest_revealtype_injector.plugin']")
         pytester.makepyprojecttoml(self.PYPROJECT_TOML)
@@ -185,22 +199,19 @@ class TestMarkerConflicts:
             textwrap.dedent(self.TEST_CONTENT).replace(
                 "# PLACEHOLDER",
                 "@pytest.mark.notypechecker('mypy')\n"
-                "@pytest.mark.onlytypechecker('pyright')"
+                "@pytest.mark.onlytypechecker('pyright')",
             )
         )
         result = pytester.runpytest("--tb=short", "-vv")
-        assert result.ret == pytest.ExitCode.INTERNAL_ERROR
-        result.assert_outcomes(passed=0, failed=0)
+        assert result.ret == pytest.ExitCode.TESTS_FAILED
+        result.assert_outcomes(failed=1)
 
     def test_no_typechecker_left(self, pytester: pytest.Pytester) -> None:
         pytester.makeconftest("pytest_plugins = ['pytest_revealtype_injector.plugin']")
         pytester.makepyprojecttoml(self.PYPROJECT_TOML)
         pytester.makepyfile(  # pyright: ignore[reportUnknownMemberType]
-            self.TEST_CONTENT.replace(
-                "# PLACEHOLDER",
-                "@pytest.mark.onlytypechecker()"
-            )
+            self.TEST_CONTENT.replace("# PLACEHOLDER", "@pytest.mark.onlytypechecker()")
         )
         result = pytester.runpytest("--tb=short", "-vv")
-        assert result.ret == pytest.ExitCode.INTERNAL_ERROR
-        result.assert_outcomes(passed=0, failed=0)
+        assert result.ret == pytest.ExitCode.OK
+        result.assert_outcomes(skipped=1)