Merge branch 'main' into removing-setuptools._distutils

Author: Avasam

.github/renovate.json5

@@ -7,32 +7,26 @@
   "semanticCommits": "disabled",
   "separateMajorMinor": false,
   "prHourlyLimit": 10,
+  // This package rule disables updates for `actions/setup-python` Python versions:
+  // it's better to do these manually as there's often a reason why we can't use
+  // the latest Python version in CI for a specific job
+  ignoreDeps: ["python"],
   "pre-commit": {
     "enabled": true
   },
   "packageRules": [
     {
-      "groupName": "GitHub Actions",
-      "matchManagers": ["github-actions"],
-      "description": "Quarterly update of GitHub Action dependencies",
-      "schedule": ["every 3 months on the first day of the month"]
-    },
-    {
-      // This package rule disables updates for `actions/setup-python` Python versions:
-      // it's better to do these manually as there's often a reason why we can't use
-      // the latest Python version in CI for a specific job
-      groupName: "Python versions",
+      groupName: "GitHub Actions",
       matchManagers: ["github-actions"],
-      matchPackageNames: ["python"],
-      description: "Disable PRs updating Python versions",
-      enabled: false,
+      description: "Quarterly update of GitHub Action dependencies",
+      schedule: ["every 3 months on the first day of the month"]
     },
     {
-      "groupName": "most test/lint dependencies",
-      "matchManagers": ["pip_requirements", "pre-commit"],
-      "excludePackageNames": ["pytype", "pyright"],
-      "description": "Quarterly update of most test dependencies",
-      "schedule": ["every 3 months on the first day of the month"]
+      groupName: "most test/lint dependencies",
+      matchManagers: ["pip_requirements", "pre-commit"],
+      matchPackageNames: ["!pytype", "!pyright"],
+      description: "Quarterly update of most test dependencies",
+      schedule: ["every 3 months on the first day of the month"]
     },
     {
       "groupName": "pytype and pyright",

.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.11.2 # must match requirements-tests.txt
+    rev: v0.11.4 # must match requirements-tests.txt
     hooks:
       - id: ruff
         name: Run ruff on stubs, tests and scripts

lib/ts_utils/metadata.py

@@ -5,21 +5,21 @@
 
 from __future__ import annotations
 
+import functools
 import re
 import urllib.parse
 from collections.abc import Mapping
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Final, NamedTuple, final
-from typing_extensions import Annotated, TypeGuard
+from typing import Annotated, Final, NamedTuple, final
+from typing_extensions import TypeGuard
 
 import tomli
 import tomlkit
 from packaging.requirements import Requirement
 from packaging.specifiers import Specifier
 
 from .paths import PYPROJECT_PATH, STUBS_PATH, distribution_path
-from .utils import cache
 
 __all__ = [
     "NoSuchStubError",
@@ -42,7 +42,7 @@ def _is_list_of_strings(obj: object) -> TypeGuard[list[str]]:
     return isinstance(obj, list) and all(isinstance(item, str) for item in obj)
 
 
-@cache
+@functools.cache
 def _get_oldest_supported_python() -> str:
     with PYPROJECT_PATH.open("rb") as config:
         val = tomli.load(config)["tool"]["typeshed"]["oldest_supported_python"]
@@ -79,7 +79,7 @@ def system_requirements_for_platform(self, platform: str) -> list[str]:
         return ret
 
 
-@cache
+@functools.cache
 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:
@@ -188,7 +188,7 @@ class NoSuchStubError(ValueError):
     """Raise NoSuchStubError to indicate that a stubs/{distribution} directory doesn't exist."""
 
 
-@cache
+@functools.cache
 def read_metadata(distribution: str) -> StubMetadata:
     """Return an object describing the metadata of a stub as given in the METADATA.toml file.
 
@@ -329,12 +329,12 @@ class PackageDependencies(NamedTuple):
     external_pkgs: tuple[Requirement, ...]
 
 
-@cache
+@functools.cache
 def get_pypi_name_to_typeshed_name_mapping() -> Mapping[str, str]:
     return {read_metadata(stub_dir.name).stub_distribution: stub_dir.name for stub_dir in STUBS_PATH.iterdir()}
 
 
-@cache
+@functools.cache
 def read_dependencies(distribution: str) -> PackageDependencies:
     """Read the dependencies listed in a METADATA.toml file for a stubs package.
 
@@ -361,7 +361,7 @@ def read_dependencies(distribution: str) -> PackageDependencies:
     return PackageDependencies(tuple(typeshed), tuple(external))
 
 
-@cache
+@functools.cache
 def get_recursive_requirements(package_name: str) -> PackageDependencies:
     """Recursively gather dependencies for a single stubs package.
 

lib/ts_utils/utils.py

@@ -2,12 +2,12 @@
 
 from __future__ import annotations
 
+import functools
 import re
 import sys
 from collections.abc import Iterable, Mapping
-from functools import lru_cache
 from pathlib import Path
-from typing import Any, Dict, Final, NamedTuple, Tuple
+from typing import Any, Final, NamedTuple
 from typing_extensions import TypeAlias
 
 import pathspec
@@ -26,11 +26,6 @@ def colored(text: str, color: str | None = None, **kwargs: Any) -> str:  # type:
 PYTHON_VERSION: Final = f"{sys.version_info.major}.{sys.version_info.minor}"
 
 
-# A backport of functools.cache for Python <3.9
-# This module is imported by mypy_test.py, which needs to run on 3.8 in CI
-cache = lru_cache(None)
-
-
 def strip_comments(text: str) -> str:
     return text.split("#")[0].strip()
 
@@ -81,7 +76,7 @@ def print_time(t: float) -> None:
 # ====================================================================
 
 
-@cache
+@functools.cache
 def venv_python(venv_dir: Path) -> Path:
     if sys.platform == "win32":
         return venv_dir / "Scripts" / "python.exe"
@@ -93,7 +88,7 @@ def venv_python(venv_dir: Path) -> Path:
 # ====================================================================
 
 
-@cache
+@functools.cache
 def parse_requirements() -> Mapping[str, Requirement]:
     """Return a dictionary of requirements from the requirements file."""
     with REQUIREMENTS_PATH.open(encoding="UTF-8") as requirements_file:
@@ -111,8 +106,8 @@ def get_mypy_req() -> str:
 # Parsing the stdlib/VERSIONS file
 # ====================================================================
 
-VersionTuple: TypeAlias = Tuple[int, int]
-SupportedVersionsDict: TypeAlias = Dict[str, Tuple[VersionTuple, VersionTuple]]
+VersionTuple: TypeAlias = tuple[int, int]
+SupportedVersionsDict: TypeAlias = dict[str, tuple[VersionTuple, VersionTuple]]
 
 VERSIONS_PATH = STDLIB_PATH / "VERSIONS"
 VERSION_LINE_RE = re.compile(r"^([a-zA-Z_][a-zA-Z0-9_.]*): ([23]\.\d{1,2})-([23]\.\d{1,2})?$")
@@ -206,10 +201,10 @@ def allowlists(distribution_name: str) -> list[str]:
 # ====================================================================
 
 
-@cache
+@functools.cache
 def get_gitignore_spec() -> pathspec.PathSpec:
     with open(".gitignore", encoding="UTF-8") as f:
-        return pathspec.PathSpec.from_lines("gitwildmatch", f.readlines())
+        return pathspec.GitIgnoreSpec.from_lines(f)
 
 
 def spec_matches_path(spec: pathspec.PathSpec, path: Path) -> bool:

pyproject.toml

@@ -18,7 +18,7 @@ force-exclude = ".*_pb2.pyi"
 [tool.ruff]
 line-length = 130
 # Oldest supported Python version
-target-version = "py38"
+target-version = "py39"
 fix = true
 exclude = [
     # virtual environment
@@ -47,14 +47,23 @@ select = [
     "A", # flake8-builtins
     "ARG", # flake8-unused-arguments
     "B", # flake8-bugbear
+    "C4", # flake8-comprehensions
     "D", # pydocstyle
+    "DTZ", # flake8-datetimez
     "EXE", # flake8-executable
     "FA", # flake8-future-annotations
+    "FBT", # flake8-boolean-trap
+    "FLY", # flynt
     "I", # isort
     "N", # pep8-naming
     "PGH", # pygrep-hooks
+    "PIE", # flake8-pie
     "PL", # Pylint
+    "RSE", # flake8-raise
     "RUF", # Ruff-specific and unused-noqa
+    "SLOT", # flake8-slots
+    "T10", # flake8-debugger
+    "TD", # flake8-todos
     "TRY", # tryceratops
     "UP", # pyupgrade
     "YTT", # flake8-2020
@@ -159,6 +168,11 @@ ignore = [
     "PLR2004", # Magic value used in comparison, consider replacing `{value}` with a constant variable
     # Keep codeflow path separation explicit
     "PLR5501", # Use `elif` instead of `else` then `if`, to reduce indentation
+    # Allow FIXME
+    "TD001", # Invalid TODO tag: `{tag}`
+    # Git blame is sufficient
+    "TD002", # Missing author in TODO;
+    "TD003", # Missing issue link for this TODO
     # Mostly from scripts and tests, it's ok to have messages passed directly to exceptions
     "TRY003", # Avoid specifying long messages outside the exception class
     # Slower and more verbose https://github.com/astral-sh/ruff/issues/7871

pyrightconfig.stricter.json

@@ -24,6 +24,7 @@
         "stdlib/tkinter/ttk.pyi",
         "stubs/aiofiles/aiofiles/tempfile/temptypes.pyi",
         "stubs/antlr4-python3-runtime",
+        "stubs/auth0-python",
         "stubs/Authlib",
         "stubs/aws-xray-sdk",
         "stubs/beautifulsoup4",

requirements-tests.txt

@@ -1,7 +1,7 @@
 # Type checkers that we test our stubs against. These should always
 # be pinned to a specific version to make failure reproducible.
 mypy==1.15.0
-pyright==1.1.398
+pyright==1.1.399
 # pytype can be installed on Windows, but requires building wheels, let's not do that on the CI
 pytype==2024.10.11; platform_system != "Windows" and python_version >= "3.10" and python_version < "3.13"
 
@@ -13,7 +13,7 @@ packaging==24.2
 pathspec>=0.11.1
 pre-commit
 # Required by create_baseline_stubs.py. Must match .pre-commit-config.yaml.
-ruff==0.11.2
+ruff==0.11.4
 stubdefaulter==0.1.0
 termcolor>=2.3
 tomli==2.2.1

scripts/stubsabot.py

@@ -730,8 +730,6 @@ async def suggest_typeshed_obsolete(obsolete: Obsolete, session: aiohttp.ClientS
 
 
 async def main() -> None:
-    assert sys.version_info >= (3, 9)
-
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "--action-level",

scripts/sync_protobuf/_utils.py

@@ -2,8 +2,9 @@
 
 import subprocess
 import sys
+from collections.abc import Iterable
 from http.client import HTTPResponse
-from typing import TYPE_CHECKING, Iterable
+from typing import TYPE_CHECKING
 from urllib.request import urlopen
 from zipfile import ZipFile
 

stdlib/@tests/stubtest_allowlists/darwin-py313.txt

@@ -2,9 +2,4 @@
 # >= 3.13
 # =======
 
-# Depends on HAVE_NCURSESW and how we install CPython,
-# should be removed when 3.13 will be officially released:
-_?curses.unget_wch
-_?curses.window.get_wch
-
 (mmap.MAP_32BIT)?  # Exists locally on MacOS but not on GitHub