Merge branch 'jam' of https://github.com/marcothephoenix65/313mypy into jam

Author: marcothephoenix65

mypy/installtypes.py

@@ -21,7 +21,8 @@
 def normalize_distribution_name(name: str) -> str:
     return _DIST_NORMALIZE_RE.sub("-", name).lower()
 
-DIST_TO_MODULE_NAME: dict[str, str] = { 
+
+DIST_TO_MODULE_NAME: dict[str, str] = {  # FIX
     "python-dateutil": "dateutil",
     "pyyaml": "yaml",
     "python-xlib": "Xlib",
@@ -68,14 +69,28 @@ def resolve_stub_packages_from_lock(locked: Mapping[str, str | None]) -> list[st
         known_stubs.update(namespace_packages.values())
 
     stubs: set[str] = set()
+    # FIX
+    # for dist_name in locked:
+    #     if dist_name.startswith("types-"):
+    #         continue
+    #     candidates = {
+    #         dist_name,
+    #         dist_name.replace("-", "_"),
+    #     }
+
+    #     for module_name in candidates:
+    #         stub = stub_distribution_name(module_name)
+    #         if stub:
+    #             stubs.add(stub)
+    #     typeshed_name = f"types-{dist_name}"
+    #     if typeshed_name in known_stubs:
+    #         stubs.add(typeshed_name)
+    # return sorted(stubs)
     for dist_name in locked:
         if dist_name.startswith("types-"):
             continue
 
-        candidates = {
-            dist_name,
-            dist_name.replace("-", "_"),
-        }
+        candidates = {dist_name, dist_name.replace("-", "_")}
 
         mapped_module = DIST_TO_MODULE_NAME.get(dist_name)
         if mapped_module is not None:
@@ -98,4 +113,4 @@ def make_runtime_constraints(locked: Mapping[str, str | None]) -> list[str]:
     for name, version in sorted(locked.items()):
         if version:
             constraints.append(f"{name}=={version}")
-    return constraints
+    return constraints

mypy/main.py

@@ -30,7 +30,11 @@
 from mypy.errors import CompileError
 from mypy.find_sources import InvalidSourceList, create_source_list
 from mypy.fscache import FileSystemCache
-from mypy.installtypes import make_runtime_constraints, read_locked_packages, resolve_stub_packages_from_lock
+from mypy.installtypes import (
+    make_runtime_constraints,
+    read_locked_packages,
+    resolve_stub_packages_from_lock,
+)
 from mypy.modulefinder import (
     BuildSource,
     FindModuleCache,
@@ -136,11 +140,7 @@ def main(
     if options.install_types_from_pylock is not None and not os.path.isfile(
         options.install_types_from_pylock
     ):
-        fail(
-            f"error: Can't find lock file '{options.install_types_from_pylock}'",
-            stderr,
-            options,
-        )
+        fail(f"error: Can't find lock file '{options.install_types_from_pylock}'", stderr, options)
 
     if options.install_types and not options.incremental:
         fail(

mypy/test/testinstalltypes.py

@@ -4,24 +4,20 @@
 import tempfile
 import textwrap
 import unittest
-import sys 
-from unittest.mock import MagicMock, patch  
-from mypy.options import Options  
-from mypy.util import FancyFormatter 
-
+from types import SimpleNamespace  # ADDED
+from unittest.mock import patch  # ADDED
 
 from mypy.installtypes import (
     make_runtime_constraints,
     read_locked_packages,
     resolve_stub_packages_from_lock,
 )
-from mypy.main import install_types 
+from mypy.main import install_types  # ADDED
 
 
 class TestInstallTypesFromPylock(unittest.TestCase):
     def test_read_locked_packages(self) -> None:
-        content = textwrap.dedent(
-            """
+        content = textwrap.dedent("""
             [[package]]
             name = "requests"
             version = "2.32.3"
@@ -33,8 +29,7 @@ def test_read_locked_packages(self) -> None:
             [[package]]
             name = "types-requests"
             version = "2.32.0"
-            """
-        )
+            """)
         with tempfile.NamedTemporaryFile("w", suffix=".toml", delete=False, encoding="utf-8") as f:
             f.write(content)
             path = f.name
@@ -91,27 +86,24 @@ def test_read_locked_packages_empty_file(self) -> None:
         assert locked == {}
 
     def test_resolve_stub_packages_from_lock(self) -> None:
-        locked = {
-            "requests": "2.32.3",
-            "python-dateutil": "2.9.0",
-            "types-requests": "2.32.0",
-        }
+        locked = {"requests": "2.32.3", "python-dateutil": "2.9.0", "types-requests": "2.32.0"}
         stubs = resolve_stub_packages_from_lock(locked)
+        # requests already worked before fix because distribution name == module name.
         assert "types-requests" in stubs
-        assert "types-python-dateutil" in stubs 
 
-    #TEST: checks explicit distribution->module mapping
+        # FIX: Before my fix, this failed because the lock file used the distribution name
+        # "python-dateutil" but stubinfo.py knows the module/import name "dateutil".
+        # After adding the explicit distribution->module mapping, it should resolve.
+        assert "types-python-dateutil" in stubs  # FIX
+
+    # TEST: checks explicit distribution->module mapping
     def test_resolve_stub_packages_from_lock_handles_distribution_module_mismatch(self) -> None:
-        locked = {
-            "python-dateutil": "2.9.0",
-        }
+        locked = {"python-dateutil": "2.9.0"}
         stubs = resolve_stub_packages_from_lock(locked)
         assert "types-python-dateutil" in stubs
-    
+
     def test_resolve_stub_packages_skips_types_packages(self) -> None:
-        locked = {
-            "types-requests": "2.32.0",
-        }
+        locked = {"types-requests": "2.32.0"}
         stubs = resolve_stub_packages_from_lock(locked)
         # Should not produce "types-types-requests"
         assert "types-types-requests" not in stubs
@@ -131,11 +123,7 @@ def test_resolve_stub_packages_pyyaml_mapping(self) -> None:
         assert "types-PyYAML" in stubs
 
     def test_make_runtime_constraints(self) -> None:
-        locked = {
-            "requests": "2.32.3",
-            "python-dateutil": "2.9.0",
-            "no-version": None,
-        }
+        locked = {"requests": "2.32.3", "python-dateutil": "2.9.0", "no-version": None}
         constraints = make_runtime_constraints(locked)
         assert constraints == ["python-dateutil==2.9.0", "requests==2.32.3"]
 
@@ -146,50 +134,49 @@ def test_make_runtime_constraints_skips_none_versions(self) -> None:
         assert "python-dateutil==2.9.0" in constraints
 
     def test_make_runtime_constraints_empty(self) -> None:
-        locked: dict[str, str | None] = {}
+        locked = {}
         assert make_runtime_constraints(locked) == []
 
     def test_make_runtime_constraints_is_sorted(self) -> None:
         locked = {"zebra-lib": "1.0", "alpha-lib": "2.0"}
         constraints = make_runtime_constraints(locked)
         assert constraints == sorted(constraints)
 
-#TEST: integrations tests
+
+# FIX: stub/mock object that pretends to be a formatter so tests don’t crash.
+class DummyFormatter:
+    def style(self, text: str, *args: object, **kwargs: object) -> str:
+        return text
+
+
+# TEST: integrations tests
 class TestInstallTypesFromPylockIntegration(unittest.TestCase):
-    def make_options(self) -> Options:
-        options = Options()
-        options.python_executable = "python"
-        options.cache_dir = "unused"
-        return options
-    def make_formatter(self) -> FancyFormatter:
-        return FancyFormatter(sys.stdout, sys.stderr, False)
+    def make_options(self) -> SimpleNamespace:
+        return SimpleNamespace(python_executable="python", cache_dir="unused")
 
     @patch("mypy.main.subprocess.run")
-    def test_install_types_builds_correct_pip_command(self, mock_run: MagicMock) -> None:
-        content = textwrap.dedent(
-            """
+    def test_install_types_builds_correct_pip_command(self, mock_run) -> None:
+        content = textwrap.dedent("""
             [[package]]
             name = "requests"
             version = "2.32.3"
 
             [[package]]
             name = "python-dateutil"
             version = "2.9.0"
-            """
-        )
+            """)
 
-        with tempfile.NamedTemporaryFile(
-            "w", suffix=".toml", delete=False, encoding="utf-8"
-        ) as f:
+        with tempfile.NamedTemporaryFile("w", suffix=".toml", delete=False, encoding="utf-8") as f:
             f.write(content)
             path = f.name
 
         try:
             options = self.make_options()
-            formatter = self.make_formatter() 
+            formatter = DummyFormatter()  # FIX
 
             result = install_types(
-                formatter=formatter, 
+                # formatter=None,
+                formatter=formatter,  # FIX
                 options=options,
                 non_interactive=True,
                 pylock_path=path,
@@ -208,34 +195,38 @@ def test_install_types_builds_correct_pip_command(self, mock_run: MagicMock) ->
             self.assertIn("--constraint", cmd)
 
             # Stub packages should be installed
+            # requests already resolved before the fix.
             self.assertIn("types-requests", cmd)
+
+            # FIX: Before the fix, this was missing from the pip command because
+            # resolve_stub_packages_from_lock only tried "python-dateutil" and
+            # "python_dateutil", but stubinfo.py maps "dateutil" -> "types-python-dateutil".
+            # After adding the explicit distribution->module mapping, install_types()
+            # should include the correct stub package in the pip command.
             self.assertIn("types-python-dateutil", cmd)
 
         finally:
             os.unlink(path)
 
     @patch("mypy.main.subprocess.run")
-    def test_no_stubs_found_skips_install(self, mock_run: MagicMock) -> None: 
-        content = textwrap.dedent(
-            """
+    def test_no_stubs_found_skips_install(self, mock_run) -> None:
+        content = textwrap.dedent("""
             [[package]]
             name = "unknown-lib"
             version = "1.0.0"
-            """
-        )
+            """)
 
-        with tempfile.NamedTemporaryFile(
-            "w", suffix=".toml", delete=False, encoding="utf-8"
-        ) as f:
+        with tempfile.NamedTemporaryFile("w", suffix=".toml", delete=False, encoding="utf-8") as f:
             f.write(content)
             path = f.name
 
         try:
             options = self.make_options()
-            formatter = self.make_formatter() 
+            formatter = DummyFormatter()  # FIX
 
             result = install_types(
-                formatter=formatter,
+                # formatter=None,
+                formatter=formatter,  # FIX
                 options=options,
                 non_interactive=True,
                 pylock_path=path,
@@ -248,14 +239,12 @@ def test_no_stubs_found_skips_install(self, mock_run: MagicMock) -> None:
             os.unlink(path)
 
     @patch("mypy.main.subprocess.run")
-    def test_constraint_file_cleaned_up_after_success(self, mock_run: MagicMock) -> None:
-        content = textwrap.dedent(
-            """
+    def test_constraint_file_cleaned_up_after_success(self, mock_run) -> None:
+        content = textwrap.dedent("""
             [[package]]
             name = "requests"
             version = "2.32.3"
-            """
-        )
+            """)
         with tempfile.NamedTemporaryFile("w", suffix=".toml", delete=False, encoding="utf-8") as f:
             f.write(content)
             path = f.name
@@ -270,7 +259,7 @@ def capture_cmd(cmd: list[str], **kwargs: object) -> None:
 
         try:
             install_types(
-                formatter=self.make_formatter(),
+                formatter=DummyFormatter(),
                 options=self.make_options(),
                 non_interactive=True,
                 pylock_path=path,
@@ -285,14 +274,12 @@ def capture_cmd(cmd: list[str], **kwargs: object) -> None:
         )
 
     @patch("mypy.main.subprocess.run")
-    def test_constraint_file_cleaned_up_even_if_subprocess_fails(self, mock_run: MagicMock) -> None:
-        content = textwrap.dedent(
-            """
+    def test_constraint_file_cleaned_up_even_if_subprocess_fails(self, mock_run) -> None:
+        content = textwrap.dedent("""
             [[package]]
             name = "requests"
             version = "2.32.3"
-            """
-        )
+            """)
         with tempfile.NamedTemporaryFile("w", suffix=".toml", delete=False, encoding="utf-8") as f:
             f.write(content)
             path = f.name
@@ -309,7 +296,7 @@ def capture_and_raise(cmd: list[str], **kwargs: object) -> None:
         try:
             with self.assertRaises(RuntimeError):
                 install_types(
-                    formatter=self.make_formatter(),
+                    formatter=DummyFormatter(),
                     options=self.make_options(),
                     non_interactive=True,
                     pylock_path=path,
@@ -321,4 +308,4 @@ def capture_and_raise(cmd: list[str], **kwargs: object) -> None:
         self.assertFalse(
             os.path.exists(captured[0]),
             "Temp constraint file should be deleted even when subprocess raises",
-        )
+        )