Skip to content

Commit 1ec5712

Browse files
authored
Unpin stubtest from 3.10.5 (#8523)
1 parent 8b0b500 commit 1ec5712

File tree

8 files changed

+8
-66
lines changed

8 files changed

+8
-66
lines changed

.github/workflows/daily.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ jobs:
2020
strategy:
2121
matrix:
2222
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
23-
# temporarily pin to 3.10.5 until 3.10.6 is available on all platforms
24-
python-version: ["3.7", "3.8", "3.9", "3.10.5", "3.11-dev"]
23+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
2524
fail-fast: false
2625

2726
steps:

.github/workflows/stubtest_stdlib.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
29-
# temporarily pin to 3.10.5 until 3.10.6 is available on all platforms
30-
python-version: ["3.7", "3.8", "3.9", "3.10.5", "3.11-dev"]
29+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11-dev"]
3130
fail-fast: false
3231

3332
steps:

stdlib/_winapi.pyi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ if sys.platform == "win32":
106106
WAIT_OBJECT_0: Literal[0]
107107
WAIT_TIMEOUT: Literal[258]
108108

109-
if sys.version_info >= (3, 11):
109+
if sys.version_info >= (3, 10):
110110
LOCALE_NAME_INVARIANT: str
111111
LOCALE_NAME_MAX_LENGTH: int
112112
LOCALE_NAME_SYSTEM_DEFAULT: str
@@ -181,7 +181,7 @@ if sys.platform == "win32":
181181
def GetVersion() -> int: ...
182182
def OpenProcess(__desired_access: int, __inherit_handle: bool, __process_id: int) -> int: ...
183183
def PeekNamedPipe(__handle: int, __size: int = ...) -> tuple[int, int] | tuple[bytes, int, int]: ...
184-
if sys.version_info >= (3, 11):
184+
if sys.version_info >= (3, 10):
185185
def LCMapStringEx(locale: str, flags: int, src: str) -> str: ...
186186

187187
@overload

stdlib/sqlite3/dbapi2.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def enable_callback_tracebacks(__enable: bool) -> None: ...
217217
# takes a pos-or-keyword argument because there is a C wrapper
218218
def enable_shared_cache(enable: int) -> None: ...
219219

220-
if sys.version_info >= (3, 11):
220+
if sys.version_info >= (3, 10):
221221
def register_adapter(__type: type[_T], __adapter: _Adapter[_T]) -> None: ...
222222
def register_converter(__typename: str, __converter: _Converter) -> None: ...
223223

tests/stubtest_allowlists/darwin-py310.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
_?curses.color_pair
22
webbrowser.MacOSXOSAScript.__init__
3-
distutils.util.__warningregistry__
43

54
# Github Actions on macOS with Python 3.10.5 claims these are missing, but they do exist locally
65
(locale.bind_textdomain_codeset)?

tests/stubtest_allowlists/linux-py310.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ signal.sigtimedwait
1616
signal.sigwaitinfo
1717
select.epoll.register
1818

19-
# Exists at runtime, but missing from stubs
20-
distutils.command.build_ext.__warningregistry__
21-
2219
# ==========
2320
# Allowlist entries that cannot or should not be fixed
2421
# ==========

tests/stubtest_allowlists/py310.txt

Lines changed: 3 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -171,57 +171,6 @@ ast.ImportFrom.level # None on the class, but never None on instances
171171
# White lies around defaults
172172
dataclasses.KW_ONLY
173173

174-
# Runtime signature is incorrect (https://github.com/python/cpython/issues/93021)
175-
builtins.classmethod.__get__
176-
builtins.property.__get__
177-
builtins.staticmethod.__get__
178-
types.FunctionType.__get__
179-
types.LambdaType.__get__
180-
181-
# Missing from distutils (deprecated, to be removed in 3.12)
182-
distutils.core.Command.dump_options
183-
distutils.core.Command.ensure_finalized
184-
distutils.core.Distribution.announce
185-
distutils.core.Distribution.common_usage
186-
distutils.core.Distribution.display_option_names
187-
distutils.core.Distribution.display_options
188-
distutils.core.Distribution.dump_option_dicts
189-
distutils.core.Distribution.find_config_files
190-
distutils.core.Distribution.get_command_packages
191-
distutils.core.Distribution.global_options
192-
distutils.core.Distribution.has_c_libraries
193-
distutils.core.Distribution.has_data_files
194-
distutils.core.Distribution.has_ext_modules
195-
distutils.core.Distribution.has_headers
196-
distutils.core.Distribution.has_modules
197-
distutils.core.Distribution.has_pure_modules
198-
distutils.core.Distribution.has_scripts
199-
distutils.core.Distribution.is_pure
200-
distutils.core.Distribution.negative_opt
201-
distutils.core.Distribution.parse_command_line
202-
distutils.core.Distribution.print_command_list
203-
distutils.core.Distribution.reinitialize_command
204-
distutils.core.Distribution.run_commands
205-
distutils.cygwinccompiler.PIPE
206-
distutils.cygwinccompiler.is_cygwingcc
207-
distutils.dist.Distribution.announce
208-
distutils.dist.Distribution.common_usage
209-
distutils.dist.Distribution.display_option_names
210-
distutils.dist.Distribution.display_options
211-
distutils.dist.Distribution.dump_option_dicts
212-
distutils.dist.Distribution.find_config_files
213-
distutils.dist.Distribution.get_command_packages
214-
distutils.dist.Distribution.global_options
215-
distutils.dist.Distribution.has_c_libraries
216-
distutils.dist.Distribution.has_data_files
217-
distutils.dist.Distribution.has_ext_modules
218-
distutils.dist.Distribution.has_headers
219-
distutils.dist.Distribution.has_modules
220-
distutils.dist.Distribution.has_pure_modules
221-
distutils.dist.Distribution.has_scripts
222-
distutils.dist.Distribution.is_pure
223-
distutils.dist.Distribution.negative_opt
224-
distutils.dist.Distribution.parse_command_line
225-
distutils.dist.Distribution.print_command_list
226-
distutils.dist.Distribution.reinitialize_command
227-
distutils.dist.Distribution.run_commands
174+
# stubtest confuses stdlib distutils with setuptools-bundled distutils (#8410),
175+
# and the whole directory is going to be removed in 3.12 anyway
176+
distutils\..*

tests/stubtest_allowlists/win32-py310.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@ asyncio.IocpProactor.recvfrom
77
asyncio.IocpProactor.sendto
88
asyncio.windows_events.IocpProactor.recvfrom
99
asyncio.windows_events.IocpProactor.sendto
10-
distutils.command.build_ext.__warningregistry__
1110
msvcrt.GetErrorMode
1211
subprocess.STARTUPINFO.copy

0 commit comments

Comments
 (0)