diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 99108dcd6d28..f137f4dc59a3 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -20,8 +20,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest", "windows-latest", "macos-latest"] - # temporarily pin to 3.10.5 until 3.10.6 is available on all platforms - python-version: ["3.7", "3.8", "3.9", "3.10.5", "3.11-dev"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"] fail-fast: false steps: diff --git a/.github/workflows/stubtest_stdlib.yml b/.github/workflows/stubtest_stdlib.yml index 1a65270f8b90..57f10c3a0700 100644 --- a/.github/workflows/stubtest_stdlib.yml +++ b/.github/workflows/stubtest_stdlib.yml @@ -26,8 +26,7 @@ jobs: strategy: matrix: os: ["ubuntu-latest", "windows-latest", "macos-latest"] - # temporarily pin to 3.10.5 until 3.10.6 is available on all platforms - python-version: ["3.7", "3.8", "3.9", "3.10.5", "3.11-dev"] + python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"] fail-fast: false steps: diff --git a/stdlib/_winapi.pyi b/stdlib/_winapi.pyi index 259293c51fd3..ddea3d67ed14 100644 --- a/stdlib/_winapi.pyi +++ b/stdlib/_winapi.pyi @@ -106,7 +106,7 @@ if sys.platform == "win32": WAIT_OBJECT_0: Literal[0] WAIT_TIMEOUT: Literal[258] - if sys.version_info >= (3, 11): + if sys.version_info >= (3, 10): LOCALE_NAME_INVARIANT: str LOCALE_NAME_MAX_LENGTH: int LOCALE_NAME_SYSTEM_DEFAULT: str @@ -181,7 +181,7 @@ if sys.platform == "win32": def GetVersion() -> int: ... def OpenProcess(__desired_access: int, __inherit_handle: bool, __process_id: int) -> int: ... def PeekNamedPipe(__handle: int, __size: int = ...) -> tuple[int, int] | tuple[bytes, int, int]: ... - if sys.version_info >= (3, 11): + if sys.version_info >= (3, 10): def LCMapStringEx(locale: str, flags: int, src: str) -> str: ... @overload diff --git a/stdlib/sqlite3/dbapi2.pyi b/stdlib/sqlite3/dbapi2.pyi index 83d2df1e6da9..fbd1a10ae431 100644 --- a/stdlib/sqlite3/dbapi2.pyi +++ b/stdlib/sqlite3/dbapi2.pyi @@ -217,7 +217,7 @@ def enable_callback_tracebacks(__enable: bool) -> None: ... # takes a pos-or-keyword argument because there is a C wrapper def enable_shared_cache(enable: int) -> None: ... -if sys.version_info >= (3, 11): +if sys.version_info >= (3, 10): def register_adapter(__type: type[_T], __adapter: _Adapter[_T]) -> None: ... def register_converter(__typename: str, __converter: _Converter) -> None: ... diff --git a/tests/stubtest_allowlists/darwin-py310.txt b/tests/stubtest_allowlists/darwin-py310.txt index 25feed0ae7c9..f41bd702d282 100644 --- a/tests/stubtest_allowlists/darwin-py310.txt +++ b/tests/stubtest_allowlists/darwin-py310.txt @@ -1,6 +1,5 @@ _?curses.color_pair webbrowser.MacOSXOSAScript.__init__ -distutils.util.__warningregistry__ # Github Actions on macOS with Python 3.10.5 claims these are missing, but they do exist locally (locale.bind_textdomain_codeset)? diff --git a/tests/stubtest_allowlists/linux-py310.txt b/tests/stubtest_allowlists/linux-py310.txt index b73052b04431..7cbbe36530b3 100644 --- a/tests/stubtest_allowlists/linux-py310.txt +++ b/tests/stubtest_allowlists/linux-py310.txt @@ -16,9 +16,6 @@ signal.sigtimedwait signal.sigwaitinfo select.epoll.register -# Exists at runtime, but missing from stubs -distutils.command.build_ext.__warningregistry__ - # ========== # Allowlist entries that cannot or should not be fixed # ========== diff --git a/tests/stubtest_allowlists/py310.txt b/tests/stubtest_allowlists/py310.txt index 726ae7b344a0..40fa6fdaaf07 100644 --- a/tests/stubtest_allowlists/py310.txt +++ b/tests/stubtest_allowlists/py310.txt @@ -171,57 +171,6 @@ ast.ImportFrom.level # None on the class, but never None on instances # White lies around defaults dataclasses.KW_ONLY -# Runtime signature is incorrect (https://github.com/python/cpython/issues/93021) -builtins.classmethod.__get__ -builtins.property.__get__ -builtins.staticmethod.__get__ -types.FunctionType.__get__ -types.LambdaType.__get__ - -# Missing from distutils (deprecated, to be removed in 3.12) -distutils.core.Command.dump_options -distutils.core.Command.ensure_finalized -distutils.core.Distribution.announce -distutils.core.Distribution.common_usage -distutils.core.Distribution.display_option_names -distutils.core.Distribution.display_options -distutils.core.Distribution.dump_option_dicts -distutils.core.Distribution.find_config_files -distutils.core.Distribution.get_command_packages -distutils.core.Distribution.global_options -distutils.core.Distribution.has_c_libraries -distutils.core.Distribution.has_data_files -distutils.core.Distribution.has_ext_modules -distutils.core.Distribution.has_headers -distutils.core.Distribution.has_modules -distutils.core.Distribution.has_pure_modules -distutils.core.Distribution.has_scripts -distutils.core.Distribution.is_pure -distutils.core.Distribution.negative_opt -distutils.core.Distribution.parse_command_line -distutils.core.Distribution.print_command_list -distutils.core.Distribution.reinitialize_command -distutils.core.Distribution.run_commands -distutils.cygwinccompiler.PIPE -distutils.cygwinccompiler.is_cygwingcc -distutils.dist.Distribution.announce -distutils.dist.Distribution.common_usage -distutils.dist.Distribution.display_option_names -distutils.dist.Distribution.display_options -distutils.dist.Distribution.dump_option_dicts -distutils.dist.Distribution.find_config_files -distutils.dist.Distribution.get_command_packages -distutils.dist.Distribution.global_options -distutils.dist.Distribution.has_c_libraries -distutils.dist.Distribution.has_data_files -distutils.dist.Distribution.has_ext_modules -distutils.dist.Distribution.has_headers -distutils.dist.Distribution.has_modules -distutils.dist.Distribution.has_pure_modules -distutils.dist.Distribution.has_scripts -distutils.dist.Distribution.is_pure -distutils.dist.Distribution.negative_opt -distutils.dist.Distribution.parse_command_line -distutils.dist.Distribution.print_command_list -distutils.dist.Distribution.reinitialize_command -distutils.dist.Distribution.run_commands +# stubtest confuses stdlib distutils with setuptools-bundled distutils (#8410), +# and the whole directory is going to be removed in 3.12 anyway +distutils\..* diff --git a/tests/stubtest_allowlists/win32-py310.txt b/tests/stubtest_allowlists/win32-py310.txt index cf4e952a1cf2..264c489625c7 100644 --- a/tests/stubtest_allowlists/win32-py310.txt +++ b/tests/stubtest_allowlists/win32-py310.txt @@ -7,6 +7,5 @@ asyncio.IocpProactor.recvfrom asyncio.IocpProactor.sendto asyncio.windows_events.IocpProactor.recvfrom asyncio.windows_events.IocpProactor.sendto -distutils.command.build_ext.__warningregistry__ msvcrt.GetErrorMode subprocess.STARTUPINFO.copy