Merge branch 'main' into abstractcontextmanger

Author: KotlinIsland

.github/workflows/meta_tests.yml

@@ -61,7 +61,7 @@ jobs:
           version-file: "requirements-tests.txt"
       - run: uv pip install -r requirements-tests.txt --system
       - name: Run pyright on typeshed
-        uses: jakebailey/pyright-action@v2
+        uses: jakebailey/pyright-action@v3
         with:
           version: PATH
           python-platform: ${{ matrix.python-platform }}

.github/workflows/mypy_primer.yml

@@ -62,15 +62,15 @@ jobs:
         run: |
           echo ${{ github.event.pull_request.number }} | tee pr_number.txt
       - name: Upload mypy_primer diff + PR number
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: ${{ matrix.shard-index == 0 }}
         with:
           name: mypy_primer_diffs-${{ matrix.shard-index }}
           path: |
             diff_${{ matrix.shard-index }}.txt
             pr_number.txt
       - name: Upload mypy_primer diff
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: ${{ matrix.shard-index != 0 }}
         with:
           name: mypy_primer_diffs-${{ matrix.shard-index }}
@@ -84,7 +84,7 @@ jobs:
       contents: read
     steps:
       - name: Merge artifacts
-        uses: actions/upload-artifact/merge@v6
+        uses: actions/upload-artifact/merge@v7
         with:
           name: mypy_primer_diffs
           pattern: mypy_primer_diffs-*

.github/workflows/tests.yml

@@ -118,22 +118,22 @@ jobs:
       - name: List 3rd-party stub dependencies installed
         run: uv pip freeze
       - name: Run pyright with basic settings on all the stubs
-        uses: jakebailey/pyright-action@v2
+        uses: jakebailey/pyright-action@v3
         with:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
           annotate: ${{ matrix.python-version == '3.13' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
       - name: Run pyright with stricter settings on some of the stubs
-        uses: jakebailey/pyright-action@v2
+        uses: jakebailey/pyright-action@v3
         with:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
           python-version: ${{ matrix.python-version }}
           annotate: ${{ matrix.python-version == '3.13' && matrix.python-platform == 'Linux' }} # Having each job create the same comment is too noisy.
           project: ./pyrightconfig.stricter.json
       - name: Run pyright on the test cases
-        uses: jakebailey/pyright-action@v2
+        uses: jakebailey/pyright-action@v3
         with:
           version: PATH
           python-platform: ${{ matrix.python-platform }}

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
         args: [--fix=lf]
       - id: check-case-conflict
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.10 # must match requirements-tests.txt
+    rev: v0.15.8 # must match requirements-tests.txt
     hooks:
       - id: ruff
         name: Run ruff on stubs, tests and scripts
@@ -27,7 +27,7 @@ repos:
           - "--unsafe-fixes"
         files: '.*test_cases/.+\.py$'
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.12.0
+    rev: 26.3.1
     hooks:
       - id: black
   - repo: https://github.com/pycqa/flake8

CONTRIBUTING.md

@@ -163,7 +163,7 @@ supported:
   When the stubs are updated to a newer version
   of the library, the version of the stub should be bumped (note that
   previous versions are still available on PyPI).
-* `requires` (optional): A list of other stub packages or packages with type
+* `dependencies` (optional): A list of other stub packages or packages with type
   information that are imported by the stubs in this package. Only packages
   generated by typeshed or required by the upstream package are allowed to
   be listed here, for security reasons. See
@@ -202,9 +202,9 @@ This has the following keys:
   `--ignore_missing_stub` option to the stubtest call. See
   [tests/README.md](./tests/README.md) for more information. In most cases,
   this field should be identical to `partial_stub`.
-* `stubtest_requirements` (default: `[]`): A list of Python packages that need
+* `stubtest_dependencies` (default: `[]`): A list of Python packages that need
   to be installed for stubtest to run successfully. These packages are installed
-  in addition to the requirements in the `requires` field.
+  in addition to the dependencies in the `dependencies` field.
 * `apt_dependencies` (default: `[]`): A list of Ubuntu APT packages
   that need to be installed for stubtest to run successfully.
 * `brew_dependencies` (default: `[]`): A list of MacOS Homebrew packages

lib/ts_utils/metadata.py

@@ -84,7 +84,7 @@ class StubtestSettings:
     ignore_missing_stub: bool
     supported_platforms: list[str] | None  # None means all platforms
     ci_platforms: list[str]
-    stubtest_requirements: list[str]
+    stubtest_dependencies: list[str]
     mypy_plugins: list[str]
     mypy_plugins_config: dict[str, dict[str, Any]]
 
@@ -109,7 +109,7 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings:
     ignore_missing_stub: object = data.get("ignore_missing_stub", False)
     supported_platforms: object = data.get("supported_platforms")
     ci_platforms: object = data.get("ci_platforms", DEFAULT_STUBTEST_PLATFORMS)
-    stubtest_requirements: object = data.get("stubtest_requirements", [])
+    stubtest_dependencies: object = data.get("stubtest_dependencies", [])
     mypy_plugins: object = data.get("mypy_plugins", [])
     mypy_plugins_config: object = data.get("mypy_plugins_config", {})
 
@@ -123,7 +123,7 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings:
     assert _is_list_of_strings(brew_dependencies)
     assert _is_list_of_strings(choco_dependencies)
     assert _is_list_of_strings(extras)
-    assert _is_list_of_strings(stubtest_requirements)
+    assert _is_list_of_strings(stubtest_dependencies)
     assert _is_list_of_strings(mypy_plugins)
     assert _is_nested_dict(mypy_plugins_config)
 
@@ -151,7 +151,7 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings:
         ignore_missing_stub=ignore_missing_stub,
         supported_platforms=supported_platforms,
         ci_platforms=ci_platforms,
-        stubtest_requirements=stubtest_requirements,
+        stubtest_dependencies=stubtest_dependencies,
         mypy_plugins=mypy_plugins,
         mypy_plugins_config=mypy_plugins_config,
     )
@@ -174,7 +174,7 @@ class StubMetadata:
 
     distribution: Annotated[str, "The name of the distribution on PyPI"]
     version_spec: Annotated[Specifier, "Upstream versions that the stubs are compatible with"]
-    requires: Annotated[list[Requirement], "The parsed requirements as listed in METADATA.toml"]
+    dependencies: Annotated[list[Requirement], "The parsed dependencies as listed in METADATA.toml"]
     extra_description: str | None
     stub_distribution: Annotated[str, "The name under which the distribution is uploaded to PyPI"]
     upstream_repository: Annotated[str, "The URL of the upstream repository"] | None
@@ -193,7 +193,7 @@ def is_obsolete(self) -> bool:
 _KNOWN_METADATA_FIELDS: Final = frozenset(
     {
         "version",
-        "requires",
+        "dependencies",
         "extra_description",
         "stub_distribution",
         "upstream_repository",
@@ -216,7 +216,7 @@ def is_obsolete(self) -> bool:
         "ignore_missing_stub",
         "supported_platforms",
         "ci_platforms",
-        "stubtest_requirements",
+        "stubtest_dependencies",
         "mypy_plugins",
         "mypy_plugins_config",
     }
@@ -235,7 +235,7 @@ def read_metadata(distribution: str) -> StubMetadata:
     This function does some basic validation,
     but does no parsing, transforming or normalization of the metadata.
     Use `read_dependencies` if you need to parse the dependencies
-    given in the `requires` field, for example.
+    given in the `dependencies` field, for example.
     """
     try:
         with metadata_path(distribution).open("rb") as f:
@@ -255,9 +255,9 @@ def read_metadata(distribution: str) -> StubMetadata:
     version_spec = Specifier(version)
     assert version_spec.operator in {"==", "~="}, f"Invalid 'version' field in METADATA.toml for {distribution!r}"
 
-    requires_s: object = data.get("requires", [])  # pyright: ignore[reportUnknownMemberType]
-    assert isinstance(requires_s, list)
-    requires = [parse_requires(distribution, req) for req in requires_s]
+    dependencies_s: object = data.get("dependencies", [])  # pyright: ignore[reportUnknownMemberType]
+    assert isinstance(dependencies_s, list)
+    dependencies = [parse_dependencies(distribution, dep) for dep in dependencies_s]
 
     extra_description: object = data.get("extra_description")  # pyright: ignore[reportUnknownMemberType]
     assert isinstance(extra_description, (str, type(None)))
@@ -336,7 +336,7 @@ def read_metadata(distribution: str) -> StubMetadata:
     return StubMetadata(
         distribution=distribution,
         version_spec=version_spec,
-        requires=requires,
+        dependencies=dependencies,
         extra_description=extra_description,
         stub_distribution=stub_distribution,
         upstream_repository=upstream_repository,
@@ -366,7 +366,7 @@ def update_metadata(distribution: str, **new_values: object) -> tomlkit.TOMLDocu
     return data
 
 
-def parse_requires(distribution: str, req: object) -> Requirement:
+def parse_dependencies(distribution: str, req: object) -> Requirement:
     assert isinstance(req, str), f"Invalid requirement {req!r} for {distribution!r}"
     return Requirement(req)
 
@@ -398,7 +398,7 @@ def read_dependencies(distribution: str) -> PackageDependencies:
     pypi_name_to_typeshed_name_mapping = get_pypi_name_to_typeshed_name_mapping()
     typeshed: list[Requirement] = []
     external: list[Requirement] = []
-    for dependency in read_metadata(distribution).requires:
+    for dependency in read_metadata(distribution).dependencies:
         if dependency.name in pypi_name_to_typeshed_name_mapping:
             req = Requirement(str(dependency))  # copy the requirement
             req.name = pypi_name_to_typeshed_name_mapping[dependency.name]

lib/ts_utils/utils.py

@@ -50,7 +50,7 @@ def colored(text: str, color: str | None = None, **kwargs: Any) -> str:  # type:
 
 
 def strip_comments(text: str) -> str:
-    return text.split("#")[0].strip()
+    return text.split("#", maxsplit=1)[0].strip()
 
 
 def jsonc_to_json(text: str) -> str:

requirements-tests.txt

@@ -1,23 +1,23 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
-mypy==1.19.1
+mypy==1.20.0
 pyright==1.1.408
 
 # Libraries used by our various scripts.
-aiohttp==3.13.3
+aiohttp==3.13.5
 grpcio-tools>=1.76.0 # For grpc_tools.protoc
-mypy-protobuf==4.0.0
-packaging==25.0
+mypy-protobuf==5.0.0
+packaging==26.0
 pathspec>=1.0.3
 pre-commit
 # Required by create_baseline_stubs.py. Must match .pre-commit-config.yaml.
-ruff==0.14.10
+ruff==0.15.8
 stubdefaulter==0.1.0
 termcolor>=2.3
-tomli==2.3.0; python_version < "3.11"
-tomlkit==0.13.3
+tomli==2.4.1; python_version < "3.11"
+tomlkit==0.14.0
 typing_extensions>=4.15.0rc1
-uv==0.9.22
+uv==0.11.2
 
 # Utilities for typeshed infrastructure scripts.
 ts_utils @ file:lib

scripts/create_baseline_stubs.py

@@ -188,12 +188,10 @@ def add_pyright_exclusion(stub_dir: Path) -> None:
 
 
 def main() -> None:
-    parser = argparse.ArgumentParser(
-        description="""Generate baseline stubs automatically for an installed pip package
+    parser = argparse.ArgumentParser(description="""Generate baseline stubs automatically for an installed pip package
                        using stubgen. Also run Black and Ruff. If the name of
                        the project is different from the runtime Python package name, you may
-                       need to use --package (example: --package yaml PyYAML)."""
-    )
+                       need to use --package (example: --package yaml PyYAML).""")
     parser.add_argument("project", help="name of PyPI project for which to generate stubs under stubs/")
     parser.add_argument("--package", help="generate stubs for this Python package (default is autodetected)")
     args = parser.parse_args()

scripts/stubsabot.py

@@ -844,24 +844,20 @@ def get_update_pr_body(update: Update, metadata: Mapping[str, Any]) -> str:
     stubtest_settings: dict[str, Any] = metadata.get("tool", {}).get("stubtest", {})
     stubtest_will_run = not stubtest_settings.get("skip", False)
     if stubtest_will_run:
-        body += textwrap.dedent(
-            """
+        body += textwrap.dedent("""
 
             If stubtest fails for this PR:
             - Leave this PR open (as a reminder, and to prevent stubsabot from opening another PR)
             - Fix stubtest failures in another PR, then close this PR
 
             Note that you will need to close and re-open the PR in order to trigger CI
-            """
-        )
+            """)
     else:
-        body += textwrap.dedent(
-            f"""
+        body += textwrap.dedent(f"""
 
             :warning: Review this PR manually, as stubtest is skipped in CI for {update.distribution}!
             Also check whether stubtest can be reenabled. :warning:
-            """
-        )
+            """)
     return body