typing-protocol-intersection 0.3.4__tar.gz → 0.3.7__tar.gz

{typing-protocol-intersection-0.3.4 → typing-protocol-intersection-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: typing-protocol-intersection
-Version: 0.3.4
+Version: 0.3.7
 Summary: Protocol intersection for mypy
 Home-page: https://github.com/klausweiss/typing-protocol-intersection
 Project-URL: Bug Tracker, https://github.com/klausweiss/typing-protocol-intersection/issues
@@ -31,7 +31,7 @@ See the [examples](#examples) section below.
 
 ## Supported versions
 
-The plugin supports python 3.7, 3.8, 3.9, 3.10 and 3.11 and mypy >= 0.920 and <= 1.4.x.
+The plugin supports python 3.7, 3.8, 3.9, 3.10 and 3.11 and mypy >= 0.920 and <= 1.5.x.
 
 ## Installation
 

{typing-protocol-intersection-0.3.4 → typing-protocol-intersection-0.3.7}/README.md

@@ -12,7 +12,7 @@ See the [examples](#examples) section below.
 
 ## Supported versions
 
-The plugin supports python 3.7, 3.8, 3.9, 3.10 and 3.11 and mypy >= 0.920 and <= 1.4.x.
+The plugin supports python 3.7, 3.8, 3.9, 3.10 and 3.11 and mypy >= 0.920 and <= 1.5.x.
 
 ## Installation
 

{typing-protocol-intersection-0.3.4 → typing-protocol-intersection-0.3.7}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = typing-protocol-intersection
-version = 0.3.4
+version = 0.3.7
 description = Protocol intersection for mypy
 long_description = file: README.md
 long_description_content_type = text/markdown

{typing-protocol-intersection-0.3.4 → typing-protocol-intersection-0.3.7}/tests/test_mypy_plugin.py

@@ -1,8 +1,6 @@
 import typing
 from pathlib import Path
 
-import mypy.api
-import mypy.version
 import pytest
 
 import typing_protocol_intersection.mypy_plugin
@@ -45,14 +43,14 @@ def get_expected_stderr(contents: str) -> str:
 
 
 @pytest.fixture()
-def testcase_file(request):
+def testcase_file(request, strip_invisible):
     path = request.param
     with open(HERE / path, encoding="utf-8") as file:
         contents = file.read()
     return _TestCase(
         HERE / path,
-        _strip(get_expected_stdout(contents)),
-        _strip(get_expected_stderr(contents)),
+        strip_invisible(get_expected_stdout(contents)),
+        strip_invisible(get_expected_stderr(contents)),
     )
 
 
@@ -96,35 +94,17 @@ def testcase_file(request):
     ],
     indirect=["testcase_file"],
 )
-def test_mypy_plugin(testcase_file: _TestCase):
-    stdout, stderr = _run_mypy(testcase_file.path)
+def test_mypy_plugin(testcase_file: _TestCase, run_mypy):
+    stdout, stderr = run_mypy(testcase_file.path)
     assert (stdout.strip(), stderr.strip()) == (testcase_file.expected_stdout, testcase_file.expected_stderr)
 
 
-def _run_mypy(input_file: Path) -> typing.Tuple[str, str]:
-    stdout, stderr, _ = mypy.api.run(
-        [str(input_file), "--config-file", str(HERE / "test-mypy.ini"), "--no-incremental"]
-    )
-    return _strip(stdout), _strip(stderr)
-
-
-def _strip(string: str) -> str:
-    """Removes all zero-width spaces from the input text and strips
-    whitespaces.
-
-    The need for the former was born with an ugly hack that we use to
-    trick mypyc.
-    """
-    zero_width_space = "\u200B"
-    return string.strip().replace(zero_width_space, "")
-
-
 @pytest.mark.parametrize(
     "version",
     [
         pytest.param("0.910", id="0.910 - before the first supported 0.920"),
         pytest.param("0.992", id="0.992 - non-existent version greater than the last tested 0.x"),
-        pytest.param("1.5.0", id="1.5.0 - first greater than 1.4.x with breaking changes"),
+        pytest.param("1.6.0", id="1.6.0 - first greater than 1.5.x with breaking changes"),
     ],
 )
 def test_raises_for_unsupported_mypy_versions(version: str) -> None:
@@ -143,6 +123,8 @@ def test_raises_for_unsupported_mypy_versions(version: str) -> None:
         pytest.param("1.2.0", id="1.2.0 - some 1.2.x version"),
         pytest.param("1.3.0", id="1.3.0 - some 1.3.x version"),
         pytest.param("1.4.0", id="1.4.0 - some 1.4.x version"),
+        pytest.param("1.5.0", id="1.5.0 - some 1.5.x version"),
+        pytest.param("1.5.0", id="1.5.0 - some 1.5.x version"),
     ],
 )
 def test_initializes_for_supported_mypy_versions(version: str) -> None:

{typing-protocol-intersection-0.3.4 → typing-protocol-intersection-0.3.7}/typing_protocol_intersection/mypy_plugin.py

@@ -23,6 +23,15 @@ SignatureContext = typing.Union[mypy.plugin.FunctionSigContext, mypy.plugin.Meth
 class ProtocolIntersectionPlugin(mypy.plugin.Plugin):
     # pylint: disable=unused-argument
 
+    def report_config_data(self, ctx: mypy.plugin.ReportConfigContext) -> int:
+        # Whatever this method returns is used by mypy to determine whether a module should be checked again or if a
+        # cache-loaded info will do. If the obtained value is different from the previous one, cache is invalidated.
+        #
+        # As far as this plugin is concerned, this method is only used to aid generation of `UniqueFullname`s. If it
+        # wasn't for this method, mypy couldn't identify where a runtime-generated class name comes from, as it looks up
+        # the class names in the cache (and subsequently crashes when it fails to find them).
+        return UniqueFullname.instance_counter
+
     def get_type_analyze_hook(
         self, fullname: str
     ) -> Optional[Callable[[mypy.plugin.AnalyzeTypeContext], mypy.types.Type]]:
@@ -193,7 +202,7 @@ def plugin(version: str) -> typing.Type[mypy.plugin.Plugin]:
     numeric_prefixes = (_numeric_prefix(x) for x in version_prefix.split("."))
     parted_version = tuple(int(prefix) if prefix else None for prefix in numeric_prefixes)
     if (len(parted_version) == 2 and (0, 920) <= parted_version <= (0, 991)) or (
-        len(parted_version) == 3 and (1, 0, 0) <= parted_version < (1, 5, 0)
+        len(parted_version) == 3 and (1, 0, 0) <= parted_version < (1, 6, 0)
     ):
         return ProtocolIntersectionPlugin
 

{typing-protocol-intersection-0.3.4 → typing-protocol-intersection-0.3.7}/typing_protocol_intersection.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: typing-protocol-intersection
-Version: 0.3.4
+Version: 0.3.7
 Summary: Protocol intersection for mypy
 Home-page: https://github.com/klausweiss/typing-protocol-intersection
 Project-URL: Bug Tracker, https://github.com/klausweiss/typing-protocol-intersection/issues
@@ -31,7 +31,7 @@ See the [examples](#examples) section below.
 
 ## Supported versions
 
-The plugin supports python 3.7, 3.8, 3.9, 3.10 and 3.11 and mypy >= 0.920 and <= 1.4.x.
+The plugin supports python 3.7, 3.8, 3.9, 3.10 and 3.11 and mypy >= 0.920 and <= 1.5.x.
 
 ## Installation