Merge branch 'main' into setuptools-add-compilers

donbarbos · web-flow · commit 7fbf0b0d2fb1 · 2026-02-09T14:58:23.000Z
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
 
     steps:
diff --git a/.github/workflows/meta_tests.yml b/.github/workflows/meta_tests.yml
@@ -65,7 +65,7 @@ jobs:
         with:
           version: PATH
           python-platform: ${{ matrix.python-platform }}
-          python-version: "3.9" # Oldest version supported for running scripts and tests
+          python-version: "3.10" # Oldest version supported for running scripts and tests
           project: ./pyrightconfig.scripts_and_tests.json
   stubsabot-dry-run:
     name: Stubsabot dry run
diff --git a/.github/workflows/stubtest_stdlib.yml b/.github/workflows/stubtest_stdlib.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
 
     steps:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         platform: ["linux", "win32", "darwin"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v6
@@ -84,7 +84,7 @@ jobs:
     strategy:
       matrix:
         python-platform: ["Linux", "Windows", "Darwin"]
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.11", "3.12", "3.13", "3.14"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v6
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -55,8 +55,6 @@ Note that some tests require extra setup steps to install the required dependenc
   <td>Linux / macOS / WSL</td>
   <td>
 
-  On Linux and macOS, you will be able to run the full test suite on Python
-  3.9-3.12.
   To install the necessary requirements, run the following commands from a
   terminal window:
 
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ the project the stubs are for, but instead report them here to typeshed.**
 Further documentation on stub files, typeshed, and Python's typing system in
 general, can also be found at https://typing.readthedocs.io/en/latest/.
 
-Typeshed supports Python versions 3.9 to 3.14.
+Typeshed supports Python versions 3.10 to 3.14.
 
 ## Using
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,8 +12,6 @@ skip-magic-trailing-comma = true
 
 [tool.ruff]
 line-length = 130
-# Oldest supported Python version
-target-version = "py39"
 fix = true
 exclude = [
     # virtual environment
@@ -255,12 +253,10 @@ extra-standard-library = [
     "_typeshed",
     "typing_extensions",
     # Extra modules not recognized by Ruff
-    # Added in Python 3.9
-    "zoneinfo",
     # Added in Python 3.14
     "compression",
 ]
 known-first-party = ["_utils", "ts_utils"]
 
 [tool.typeshed]
-oldest_supported_python = "3.9"
+oldest_supported_python = "3.10"
diff --git a/stdlib/@tests/stubtest_allowlists/win32-py39.txt b/stdlib/@tests/stubtest_allowlists/win32-py39.txt
@@ -2,6 +2,12 @@
 # Temporary
 # =========
 
+# According to stubtest, these are sometimes not present at runtime, starting
+# with Python 3.9.13. Which is not true.
+(_frozen_importlib_external.PathFinder.find_distributions)?
+(importlib._bootstrap_external.PathFinder.find_distributions)?
+(importlib.machinery.PathFinder.find_distributions)?
+
 # Added in Python 3.9.14
 # (Remove once 3.9.14 becomes available for GitHub Actions)
 sys.set_int_max_str_digits
diff --git a/stdlib/enum.pyi b/stdlib/enum.pyi
@@ -4,7 +4,7 @@ import types
 from _typeshed import SupportsKeysAndGetItem, Unused
 from builtins import property as _builtins_property
 from collections.abc import Callable, Iterable, Iterator, Mapping
-from typing import Any, Final, Generic, Literal, TypeVar, overload
+from typing import Any, Final, Generic, Literal, SupportsIndex, TypeVar, overload
 from typing_extensions import Self, TypeAlias, disjoint_base
 
 __all__ = ["EnumMeta", "Enum", "IntEnum", "Flag", "IntFlag", "auto", "unique"]
@@ -311,6 +311,7 @@ if sys.version_info >= (3, 11):
     def global_enum_repr(self: Enum) -> str: ...
     def global_flag_repr(self: Flag) -> str: ...
     def show_flag_values(value: int) -> list[int]: ...
+    def bin(num: SupportsIndex, max_bits: int | None = None) -> str: ...
 
 if sys.version_info >= (3, 12):
     # The body of the class is the same, but the base classes are different.
diff --git a/stubs/gunicorn/METADATA.toml b/stubs/gunicorn/METADATA.toml
@@ -1,4 +1,4 @@
-version = "25.0.*"
+version = "25.0.2"
 upstream_repository = "https://github.com/benoitc/gunicorn"
 requires = ["types-gevent"]
 
diff --git a/stubs/gunicorn/gunicorn/config.pyi b/stubs/gunicorn/gunicorn/config.pyi
@@ -1175,6 +1175,16 @@ class ASGILifespan(Setting):
     default: ClassVar[str]
     desc: ClassVar[str]
 
+class ASGIDisconnectGracePeriod(Setting):
+    name: ClassVar[str]
+    section: ClassVar[str]
+    cli: ClassVar[list[str]]
+    meta: ClassVar[str]
+    validator: ClassVar[_IntValidatorType]
+    type: ClassVar[type[int]]
+    default: ClassVar[int]
+    desc: ClassVar[str]
+
 class RootPath(Setting):
     name: ClassVar[str]
     section: ClassVar[str]
diff --git a/stubs/networkx/METADATA.toml b/stubs/networkx/METADATA.toml
@@ -2,8 +2,6 @@ version = "3.6.1"
 upstream_repository = "https://github.com/networkx/networkx"
 # requires a version of numpy with a `py.typed` file
 requires = ["numpy>=1.20"]
-# Uses more recent dataclass kwargs
-requires_python = ">=3.10"
 
 [tool.stubtest]
 # stub_uploader won't allow pandas-stubs in the requires field https://github.com/typeshed-internal/stub_uploader/issues/90
diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml
@@ -1,4 +1,4 @@
-version = "80.10.*"
+version = "81.0.*"
 upstream_repository = "https://github.com/pypa/setuptools"
 extra_description = """\
 Given that `pkg_resources` is typed since `setuptools >= 71.1`, \
diff --git a/stubs/setuptools/setuptools/__init__.pyi b/stubs/setuptools/setuptools/__init__.pyi
@@ -107,7 +107,6 @@ def setup(
     # Attributes from distutils.dist.Distribution.__init__ (except self.metadata)
     # These take priority over attributes from distutils.dist.Distribution.display_option_names
     verbose: bool = True,
-    dry_run: bool = False,
     help: bool = False,
     cmdclass: _MutableDictLike[str, type[_Command]] = {},
     command_packages: str | list[str] | None = None,
@@ -164,6 +163,7 @@ def setup(
 class Command(_Command):
     command_consumes_arguments: bool
     distribution: Distribution
+    dry_run: bool
     # Any: Dynamic command subclass attributes
     def __init__(self, dist: Distribution, **kw: Any) -> None: ...
     # Note: Commands that setuptools doesn't re-expose are considered deprecated (they must be imported from distutils directly)
diff --git a/stubs/setuptools/setuptools/_distutils/archive_util.pyi b/stubs/setuptools/setuptools/_distutils/archive_util.pyi
@@ -8,7 +8,6 @@ def make_archive(
     root_dir: StrOrBytesPath | None = None,
     base_dir: str | None = None,
     verbose: bool = False,
-    dry_run: bool = False,
     owner: str | None = None,
     group: str | None = None,
 ) -> str: ...
@@ -19,7 +18,6 @@ def make_archive(
     root_dir: StrOrBytesPath,
     base_dir: str | None = None,
     verbose: bool = False,
-    dry_run: bool = False,
     owner: str | None = None,
     group: str | None = None,
 ) -> str: ...
@@ -28,8 +26,7 @@ def make_tarball(
     base_dir: StrPath,
     compress: Literal["gzip", "bzip2", "xz"] | None = "gzip",
     verbose: bool = False,
-    dry_run: bool = False,
     owner: str | None = None,
     group: str | None = None,
 ) -> str: ...
-def make_zipfile(base_name: str, base_dir: StrPath, verbose: bool = False, dry_run: bool = False) -> str: ...
+def make_zipfile(base_name: str, base_dir: StrPath, verbose: bool = False) -> str: ...
diff --git a/stubs/setuptools/setuptools/_distutils/cmd.pyi b/stubs/setuptools/setuptools/_distutils/cmd.pyi
@@ -12,7 +12,6 @@ _CommandT = TypeVar("_CommandT", bound=Command)
 _Ts = TypeVarTuple("_Ts")
 
 class Command:
-    dry_run: bool  # Exposed from __getattr_. Same as Distribution.dry_run
     distribution: Distribution
     # Any to work around variance issues
     sub_commands: ClassVar[list[tuple[str, Callable[[Any], bool] | None]]]
diff --git a/stubs/setuptools/setuptools/_distutils/compilers/C/base.pyi b/stubs/setuptools/setuptools/_distutils/compilers/C/base.pyi
@@ -25,7 +25,6 @@ class Compiler:
 
     language_map: ClassVar[dict[str, str]]
     language_order: ClassVar[list[str]]
-    dry_run: bool
     force: bool
     verbose: bool
     output_dir: str | None
@@ -39,7 +38,7 @@ class Compiler:
     SHARED_OBJECT: Final = "shared_object"
     SHARED_LIBRARY: Final = "shared_library"
     EXECUTABLE: Final = "executable"
-    def __init__(self, verbose: bool = False, dry_run: bool = False, force: bool = False) -> None: ...
+    def __init__(self, verbose: bool = False, force: bool = False) -> None: ...
     def add_include_dir(self, dir: str) -> None: ...
     def set_include_dirs(self, dirs: list[str]) -> None: ...
     def add_library(self, libname: str) -> None: ...
@@ -200,7 +199,7 @@ compiler_class: dict[str, tuple[str, str, str]]
 
 def show_compilers() -> None: ...
 def new_compiler(
-    plat: str | None = None, compiler: str | None = None, verbose: bool = False, dry_run: bool = False, force: bool = False
+    plat: str | None = None, compiler: str | None = None, verbose: bool = False, force: bool = False
 ) -> Compiler: ...
 def gen_preprocess_options(macros: Iterable[_Macro], include_dirs: Iterable[str]) -> list[str]: ...
 def gen_lib_options(
diff --git a/stubs/setuptools/setuptools/_distutils/dist.pyi b/stubs/setuptools/setuptools/_distutils/dist.pyi
@@ -73,7 +73,6 @@ class Distribution:
     display_option_names: ClassVar[list[str]]
     negative_opt: ClassVar[dict[str, str]]
     verbose: bool
-    dry_run: bool
     help: bool
     command_packages: str | list[str] | None
     script_name: StrPath | None
diff --git a/stubs/setuptools/setuptools/_distutils/spawn.pyi b/stubs/setuptools/setuptools/_distutils/spawn.pyi
@@ -5,18 +5,10 @@ from typing import Literal, overload
 
 @overload
 def spawn(
-    cmd: Sequence[StrOrBytesPath],
-    search_path: Literal[False],
-    verbose: Unused = False,
-    dry_run: bool = False,
-    env: _ENV | None = None,
+    cmd: Sequence[StrOrBytesPath], search_path: Literal[False], verbose: Unused = False, env: _ENV | None = None
 ) -> None: ...
 @overload
 def spawn(
-    cmd: MutableSequence[bytes | StrPath],
-    search_path: Literal[True] = True,
-    verbose: Unused = False,
-    dry_run: bool = False,
-    env: _ENV | None = None,
+    cmd: MutableSequence[bytes | StrPath], search_path: Literal[True] = True, verbose: Unused = False, env: _ENV | None = None
 ) -> None: ...
 def find_executable(executable: str, path: str | None = None) -> str | None: ...
diff --git a/stubs/setuptools/setuptools/_distutils/util.pyi b/stubs/setuptools/setuptools/_distutils/util.pyi
@@ -17,11 +17,7 @@ def subst_vars(s: str, local_vars: Mapping[str, object]) -> str: ...
 def grok_environment_error(exc: object, prefix: str = "error: ") -> str: ...
 def split_quoted(s: str) -> list[str]: ...
 def execute(
-    func: Callable[[Unpack[_Ts]], Unused],
-    args: tuple[Unpack[_Ts]],
-    msg: str | None = None,
-    verbose: bool = False,
-    dry_run: bool = False,
+    func: Callable[[Unpack[_Ts]], Unused], args: tuple[Unpack[_Ts]], msg: str | None = None, verbose: bool = False
 ) -> None: ...
 def strtobool(val: str) -> Literal[0, 1]: ...
 def byte_compile(
@@ -31,7 +27,6 @@ def byte_compile(
     prefix: str | None = None,
     base_dir: str | None = None,
     verbose: bool = True,
-    dry_run: bool = False,
     direct: bool | None = None,
 ) -> None: ...
 def rfc822_escape(header: str) -> str: ...
diff --git a/stubs/setuptools/setuptools/command/bdist_egg.pyi b/stubs/setuptools/setuptools/command/bdist_egg.pyi
@@ -52,10 +52,5 @@ def can_scan() -> bool: ...
 INSTALL_DIRECTORY_ATTRS: Final[list[str]]
 
 def make_zipfile(
-    zip_filename: _StrPathT,
-    base_dir,
-    verbose: bool = False,
-    dry_run: bool = False,
-    compress: bool = True,
-    mode: _ZipFileMode = "w",
+    zip_filename: _StrPathT, base_dir, verbose: bool = False, compress: bool = True, mode: _ZipFileMode = "w"
 ) -> _StrPathT: ...
diff --git a/stubs/setuptools/setuptools/command/editable_wheel.pyi b/stubs/setuptools/setuptools/command/editable_wheel.pyi
@@ -72,7 +72,6 @@ class _NamespaceInstaller(namespaces.Installer):
     installation_dir: Incomplete
     editable_name: Incomplete
     outputs: list[str]
-    dry_run: bool
     def __init__(self, distribution, installation_dir, editable_name, src_root) -> None: ...
 
 class InformationOnly(SetuptoolsWarning): ...
diff --git a/stubs/setuptools/setuptools/command/setopt.pyi b/stubs/setuptools/setuptools/command/setopt.pyi
@@ -7,7 +7,7 @@ from .. import Command
 __all__ = ["config_file", "edit_config", "option_base", "setopt"]
 
 def config_file(kind: str = "local"): ...
-def edit_config(filename, settings, dry_run: bool = False) -> None: ...
+def edit_config(filename, settings) -> None: ...
 
 class option_base(Command):
     user_options: ClassVar[list[tuple[str, str, str]]]
diff --git a/tests/mypy_test.py b/tests/mypy_test.py
@@ -44,7 +44,7 @@
     print_error("Cannot import mypy. Did you install it?")
     sys.exit(1)
 
-SUPPORTED_VERSIONS = ["3.14", "3.13", "3.12", "3.11", "3.10", "3.9"]
+SUPPORTED_VERSIONS = ["3.14", "3.13", "3.12", "3.11", "3.10"]
 SUPPORTED_PLATFORMS = ("linux", "win32", "darwin")
 DIRECTORIES_TO_TEST = [STDLIB_PATH, STUBS_PATH]
 
diff --git a/tests/regr_test.py b/tests/regr_test.py
@@ -41,7 +41,7 @@
 TYPESHED = "typeshed"
 
 SUPPORTED_PLATFORMS = ["linux", "darwin", "win32"]
-SUPPORTED_VERSIONS = ["3.14", "3.13", "3.12", "3.11", "3.10", "3.9"]
+SUPPORTED_VERSIONS = ["3.14", "3.13", "3.12", "3.11", "3.10"]
 
 
 def distribution_with_test_cases(distribution_name: str) -> DistributionTests:
diff --git a/tests/runtests.py b/tests/runtests.py
@@ -50,7 +50,7 @@ def main() -> None:
     parser.add_argument(
         "--python-version",
         default=None,
-        choices=("3.9", "3.10", "3.11", "3.12", "3.13", "3.14"),
+        choices=("3.10", "3.11", "3.12", "3.13", "3.14"),
         # We're using the oldest fully supported version because it's the most likely to produce errors
         # due to unsupported syntax, feature, or bug in a tool.
         help="Target Python version for the test (defaults to oldest supported Python version).",
diff --git a/tests/typecheck_typeshed.py b/tests/typecheck_typeshed.py
@@ -14,7 +14,7 @@
 ReturnCode: TypeAlias = int
 
 SUPPORTED_PLATFORMS = ("linux", "darwin", "win32")
-SUPPORTED_VERSIONS = ("3.14", "3.13", "3.12", "3.11", "3.10", "3.9")
+SUPPORTED_VERSIONS = ("3.14", "3.13", "3.12", "3.11", "3.10")
 LOWEST_SUPPORTED_VERSION = min(SUPPORTED_VERSIONS, key=lambda x: int(x.split(".")[1]))
 DIRECTORIES_TO_TEST = ("scripts", "tests")
 EMPTY: list[str] = []

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "25.0.*"`
	`1`	`+version = "25.0.2"`
`2`	`2`	`upstream_repository = "https://github.com/benoitc/gunicorn"`
`3`	`3`	`requires = ["types-gevent"]`
`4`	`4`