Merge branch 'main' into slice_annotations

Author: Avasam

.gitattributes

@@ -4,6 +4,5 @@
 # Set linguist-language to support comments syntax highlight
 **/stubtest_allowlist*.txt linguist-language=ini
 **/stubtest_allowlists/*.txt linguist-language=ini
-tests/pytype_exclude_list.txt linguist-language=ini
 pyrightconfig*.json linguist-language=jsonc
 .vscode/*.json linguist-language=jsonc

.github/renovate.json5

@@ -24,15 +24,15 @@
     {
       groupName: "most test/lint dependencies",
       matchManagers: ["pip_requirements", "pre-commit"],
-      matchPackageNames: ["!pytype", "!pyright"],
+      matchPackageNames: ["!pyright"],
       description: "Quarterly update of most test dependencies",
       schedule: ["every 3 months on the first day of the month"]
     },
     {
-      "groupName": "pytype and pyright",
+      "groupName": "pyright",
       "matchManagers": ["pip_requirements"],
-      "matchPackageNames": ["pytype", "pyright"],
-      "description": "Daily update of pyright and pytype",
+      "matchPackageNames": ["pyright"],
+      "description": "Daily update of pyright",
       "schedule": ["before 4am"]
     }
   ]

.github/workflows/daily.yml

@@ -117,6 +117,8 @@ jobs:
           # Keep in sync with stub_uploader's check_scripts.yml workflow.
           python-version: "3.13"
       - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "typeshed/requirements-tests.txt"
       - name: Run tests
         run: |
           cd stub_uploader

.github/workflows/meta_tests.yml

@@ -53,9 +53,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          # TODO: Since pytype is not available for Python 3.13, and
-          # pytype_test.py imports pytype, we need to use Python 3.12 for now.
-          python-version: "3.12"
+          python-version: "3.13"
       - run: curl -LsSf https://astral.sh/uv/install.sh | sh
       - run: uv pip install -r requirements-tests.txt --system
       - name: Run pyright on typeshed

.github/workflows/tests.yml

@@ -34,27 +34,6 @@ jobs:
       - run: uv pip install -r requirements-tests.txt --system
       - run: python ./tests/check_typeshed_structure.py
 
-  pytype:
-    name: "pytype: Check stubs"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          # Max supported Python version as of pytype 2024.10.11
-          python-version: "3.12"
-      - uses: astral-sh/setup-uv@v6
-      - run: uv pip install -r requirements-tests.txt --system
-      - name: Install external dependencies for 3rd-party stubs
-        run: |
-          DEPENDENCIES=$( python tests/get_external_stub_requirements.py )
-          if [ -n "$DEPENDENCIES" ]; then
-              printf "Installing packages:\n  $(echo $DEPENDENCIES | sed 's/ /\n  /g')\n"
-              uv pip install --system $DEPENDENCIES
-          fi
-      - run: uv pip freeze
-      - run: ./tests/pytype_test.py --print-stderr
-
   mypy:
     name: "mypy: Check stubs"
     runs-on: ubuntu-latest
@@ -120,6 +99,8 @@ jobs:
         with:
           python-version: "3.13"
       - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "requirements-tests.txt"
       - name: Install typeshed test-suite requirements
         # Install these so we can run `get_external_stub_requirements.py`
         run: uv pip install -r requirements-tests.txt --system
@@ -186,6 +167,8 @@ jobs:
           # Keep in sync with stub_uploader's check_scripts.yml workflow.
           python-version: "3.13"
       - uses: astral-sh/setup-uv@v6
+        with:
+          version-file: "typeshed/requirements-tests.txt"
       - name: Run tests
         run: |
           cd stub_uploader

CONTRIBUTING.md

@@ -83,13 +83,6 @@ Note that some tests require extra setup steps to install the required dependenc
   (.venv) > pip install -r requirements-tests.txt
   ```
 
-  To be able to run pytype tests, you'll also need to install it manually
-as it's currently excluded from the requirements file:
-
-  ```powershell
-  (.venv) > pip install -U pytype
-  ```
-
   </td>
 </tr>
 <tr><!-- disables zebra striping --></tr>
@@ -104,10 +97,6 @@ as it's currently excluded from the requirements file:
   uv pip install -r requirements-tests.txt
   ```
 
-  ```shell
-  uv pip install -U pytype
-  ```
-
   </td>
 </tr>
 </table>

MAINTAINERS.md

@@ -5,6 +5,7 @@ At present the active maintainers are (alphabetically):
 * Ivan Levkivskyi (@ilevkivskyi)
 * Sebastian Rittau (@srittau)
 * Guido van Rossum (@gvanrossum)
+* Brian Schubert (@brianschubert)
 * Shantanu (@hauntsaninja)
 * Nikita Sobolev (@sobolevn)
 * Samuel Therrien (@Avasam)

README.md

@@ -25,9 +25,9 @@ Typeshed supports Python versions 3.9 to 3.14.
 
 ## Using
 
-If you're just using a type checker ([mypy](https://github.com/python/mypy/),
-[pyright](https://github.com/microsoft/pyright),
-[pytype](https://github.com/google/pytype/), PyCharm, ...), as opposed to
+If you're just using a type checker (e.g. [mypy](https://github.com/python/mypy/),
+[pyright](https://github.com/microsoft/pyright), or PyCharm's built-in type
+checker), as opposed to
 developing it, you don't need to interact with the typeshed repo at
 all: a copy of standard library part of typeshed is bundled with type checkers.
 And type stubs for third party packages and modules you are using can

lib/ts_utils/metadata.py

@@ -5,19 +5,26 @@
 
 from __future__ import annotations
 
+import datetime
 import functools
 import re
+import sys
 import urllib.parse
 from collections.abc import Mapping
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Annotated, Any, Final, NamedTuple, final
 from typing_extensions import TypeGuard
 
-import tomli
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
+
 import tomlkit
 from packaging.requirements import Requirement
 from packaging.specifiers import Specifier
+from tomlkit.items import String
 
 from .paths import PYPROJECT_PATH, STUBS_PATH, distribution_path
 
@@ -50,7 +57,7 @@ def _is_nested_dict(obj: object) -> TypeGuard[dict[str, dict[str, Any]]]:
 @functools.cache
 def get_oldest_supported_python() -> str:
     with PYPROJECT_PATH.open("rb") as config:
-        val = tomli.load(config)["tool"]["typeshed"]["oldest_supported_python"]
+        val = tomllib.load(config)["tool"]["typeshed"]["oldest_supported_python"]
     assert type(val) is str
     return val
 
@@ -90,7 +97,7 @@ def system_requirements_for_platform(self, platform: str) -> list[str]:
 def read_stubtest_settings(distribution: str) -> StubtestSettings:
     """Return an object describing the stubtest settings for a single stubs distribution."""
     with metadata_path(distribution).open("rb") as f:
-        data: dict[str, object] = tomli.load(f).get("tool", {}).get("stubtest", {})
+        data: dict[str, object] = tomllib.load(f).get("tool", {}).get("stubtest", {})
 
     skip: object = data.get("skip", False)
     apt_dependencies: object = data.get("apt_dependencies", [])
@@ -140,6 +147,13 @@ def read_stubtest_settings(distribution: str) -> StubtestSettings:
     )
 
 
+@final
+@dataclass(frozen=True)
+class ObsoleteMetadata:
+    since_version: Annotated[str, "A string representing a specific version"]
+    since_date: Annotated[datetime.date, "A date when the package became obsolete"]
+
+
 @final
 @dataclass(frozen=True)
 class StubMetadata:
@@ -154,7 +168,7 @@ class StubMetadata:
     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
-    obsolete_since: Annotated[str, "A string representing a specific version"] | None
+    obsolete: Annotated[ObsoleteMetadata, "Metadata indicating when the stubs package became obsolete"] | None
     no_longer_updated: bool
     uploaded_to_pypi: Annotated[bool, "Whether or not a distribution is uploaded to PyPI"]
     partial_stub: Annotated[bool, "Whether this is a partial type stub package as per PEP 561."]
@@ -163,7 +177,7 @@ class StubMetadata:
 
     @property
     def is_obsolete(self) -> bool:
-        return self.obsolete_since is not None
+        return self.obsolete is not None
 
 
 _KNOWN_METADATA_FIELDS: Final = frozenset(
@@ -214,27 +228,27 @@ def read_metadata(distribution: str) -> StubMetadata:
     """
     try:
         with metadata_path(distribution).open("rb") as f:
-            data: dict[str, object] = tomli.load(f)
+            data = tomlkit.load(f)
     except FileNotFoundError:
         raise NoSuchStubError(f"Typeshed has no stubs for {distribution!r}!") from None
 
     unknown_metadata_fields = data.keys() - _KNOWN_METADATA_FIELDS
     assert not unknown_metadata_fields, f"Unexpected keys in METADATA.toml for {distribution!r}: {unknown_metadata_fields}"
 
     assert "version" in data, f"Missing 'version' field in METADATA.toml for {distribution!r}"
-    version = data["version"]
+    version: object = data.get("version")  # pyright: ignore[reportUnknownMemberType]
     assert isinstance(version, str) and len(version) > 0, f"Invalid 'version' field in METADATA.toml for {distribution!r}"
     # Check that the version spec parses
     if version[0].isdigit():
         version = f"=={version}"
     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", [])
+    requires_s: object = data.get("requires", [])  # pyright: ignore[reportUnknownMemberType]
     assert isinstance(requires_s, list)
     requires = [parse_requires(distribution, req) for req in requires_s]
 
-    extra_description: object = data.get("extra_description")
+    extra_description: object = data.get("extra_description")  # pyright: ignore[reportUnknownMemberType]
     assert isinstance(extra_description, (str, type(None)))
 
     if "stub_distribution" in data:
@@ -244,7 +258,7 @@ def read_metadata(distribution: str) -> StubMetadata:
     else:
         stub_distribution = f"types-{distribution}"
 
-    upstream_repository: object = data.get("upstream_repository")
+    upstream_repository: object = data.get("upstream_repository")  # pyright: ignore[reportUnknownMemberType]
     assert isinstance(upstream_repository, (str, type(None)))
     if isinstance(upstream_repository, str):
         parsed_url = urllib.parse.urlsplit(upstream_repository)
@@ -268,21 +282,28 @@ def read_metadata(distribution: str) -> StubMetadata:
             )
             assert num_url_path_parts == 2, bad_github_url_msg
 
-    obsolete_since: object = data.get("obsolete_since")
-    assert isinstance(obsolete_since, (str, type(None)))
-    no_longer_updated: object = data.get("no_longer_updated", False)
+    obsolete_since: object = data.get("obsolete_since")  # pyright: ignore[reportUnknownMemberType]
+    assert isinstance(obsolete_since, (String, type(None)))
+    if obsolete_since:
+        comment = obsolete_since.trivia.comment
+        since_date_string = comment.removeprefix("# Released on ")
+        since_date = datetime.date.fromisoformat(since_date_string)
+        obsolete = ObsoleteMetadata(since_version=obsolete_since, since_date=since_date)
+    else:
+        obsolete = None
+    no_longer_updated: object = data.get("no_longer_updated", False)  # pyright: ignore[reportUnknownMemberType]
     assert type(no_longer_updated) is bool
-    uploaded_to_pypi: object = data.get("upload", True)
+    uploaded_to_pypi: object = data.get("upload", True)  # pyright: ignore[reportUnknownMemberType]
     assert type(uploaded_to_pypi) is bool
-    partial_stub: object = data.get("partial_stub", True)
+    partial_stub: object = data.get("partial_stub", True)  # pyright: ignore[reportUnknownMemberType]
     assert type(partial_stub) is bool
-    requires_python_str: object = data.get("requires_python")
+    requires_python_str: object = data.get("requires_python")  # pyright: ignore[reportUnknownMemberType]
     oldest_supported_python = get_oldest_supported_python()
     oldest_supported_python_specifier = Specifier(f">={oldest_supported_python}")
     if requires_python_str is None:
         requires_python = oldest_supported_python_specifier
     else:
-        assert type(requires_python_str) is str
+        assert isinstance(requires_python_str, str)
         requires_python = Specifier(requires_python_str)
         assert requires_python != oldest_supported_python_specifier, f'requires_python="{requires_python}" is redundant'
         # Check minimum Python version is not less than the oldest version of Python supported by typeshed
@@ -292,7 +313,7 @@ def read_metadata(distribution: str) -> StubMetadata:
         assert requires_python.operator == ">=", "'requires_python' should be a minimum version specifier, use '>=3.x'"
 
     empty_tools: dict[object, object] = {}
-    tools_settings: object = data.get("tool", empty_tools)
+    tools_settings: object = data.get("tool", empty_tools)  # pyright: ignore[reportUnknownMemberType]
     assert isinstance(tools_settings, dict)
     assert tools_settings.keys() <= _KNOWN_METADATA_TOOL_FIELDS.keys(), f"Unrecognised tool for {distribution!r}"
     for tool, tk in _KNOWN_METADATA_TOOL_FIELDS.items():
@@ -308,7 +329,7 @@ def read_metadata(distribution: str) -> StubMetadata:
         extra_description=extra_description,
         stub_distribution=stub_distribution,
         upstream_repository=upstream_repository,
-        obsolete_since=obsolete_since,
+        obsolete=obsolete,
         no_longer_updated=no_longer_updated,
         uploaded_to_pypi=uploaded_to_pypi,
         partial_stub=partial_stub,

lib/ts_utils/mypy.py

@@ -1,10 +1,14 @@
 from __future__ import annotations
 
+import sys
 from collections.abc import Generator, Iterable
 from contextlib import contextmanager
 from typing import Any, NamedTuple
 
-import tomli
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
 
 from ts_utils.metadata import StubtestSettings, metadata_path
 from ts_utils.utils import NamedTemporaryFile, TemporaryFileWrapper
@@ -26,7 +30,7 @@ class MypyDistConf(NamedTuple):
 
 def mypy_configuration_from_distribution(distribution: str) -> list[MypyDistConf]:
     with metadata_path(distribution).open("rb") as f:
-        data = tomli.load(f)
+        data = tomllib.load(f)
 
     # TODO: This could be added to ts_utils.metadata
     mypy_tests_conf: dict[str, dict[str, Any]] = data.get("mypy-tests", {})