Merge addIntegrationTests into jam

Author: marcothephoenix65

mypy/installtypes.py

@@ -21,6 +21,12 @@
 def normalize_distribution_name(name: str) -> str:
     return _DIST_NORMALIZE_RE.sub("-", name).lower()
 
+DIST_TO_MODULE_NAME: dict[str, str] = { 
+    "python-dateutil": "dateutil",
+    "pyyaml": "yaml",
+    "python-xlib": "Xlib",
+}
+
 
 def read_locked_packages(path: str) -> dict[str, str | None]:
     """Read package name/version pairs from a pylock-like TOML file.
@@ -65,11 +71,21 @@ def resolve_stub_packages_from_lock(locked: Mapping[str, str | None]) -> list[st
     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:
+            candidates.add(mapped_module)
+
         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)
@@ -82,4 +98,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,11 +30,7 @@
 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,
@@ -140,7 +136,11 @@ 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(
@@ -967,10 +967,10 @@ def add_invertible_flag(
     )
 
     add_invertible_flag(
-        "--no-strict-bytes",
-        default=True,
-        dest="strict_bytes",
-        help="Treat bytearray and memoryview as subtypes of bytes",
+        "--strict-bytes",
+        default=False,
+        strict_flag=True,
+        help="Disable treating bytearray and memoryview as subtypes of bytes",
         group=strictness_group,
     )
 
@@ -1306,13 +1306,7 @@ def add_invertible_flag(
     parser.add_argument("--test-env", action="store_true", help=argparse.SUPPRESS)
     # --local-partial-types disallows partial types spanning module top level and a function
     # (implicitly defined in fine-grained incremental mode)
-    add_invertible_flag(
-        "--no-local-partial-types",
-        inverse="--local-partial-types",
-        default=True,
-        dest="local_partial_types",
-        help=argparse.SUPPRESS,
-    )
+    add_invertible_flag("--local-partial-types", default=False, help=argparse.SUPPRESS)
     # --native-parser enables the native parser (experimental)
     add_invertible_flag("--native-parser", default=False, help=argparse.SUPPRESS)
     # --logical-deps adds some more dependencies that are not semantically needed, but