Skip to content

Commit 0ac66cd

Browse files
authored
Merge branch 'main' into pywin32--Add-win32gui._TrackMouseEvent
2 parents c47279b + 90d8559 commit 0ac66cd

File tree

525 files changed

+7117
-3827
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

525 files changed

+7117
-3827
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ jobs:
6262
sudo apt-get update -q && sudo apt-get install -qy $PACKAGES
6363
fi
6464
- name: Run mypy_test.py
65-
run: |
66-
# python-version can sometimes be pinned to a specific version or to "-dev", but
67-
# mypy understands only X.Y version numbers.
68-
MYPY_PY_VERSION=$(echo ${{ matrix.python-version }} | cut -d - -f 1 | cut -d . -f 1-2)
69-
python ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${MYPY_PY_VERSION}
65+
run: python ./tests/mypy_test.py --platform=${{ matrix.platform }} --python-version=${{ matrix.python-version }}
7066

7167
regression-tests:
7268
name: "mypy: Run test cases"
@@ -75,9 +71,7 @@ jobs:
7571
- uses: actions/checkout@v5
7672
- uses: actions/setup-python@v6
7773
with:
78-
# Use py311 for now, as py312 seems to be around 30s slower in CI
79-
# TODO: figure out why that is (#11590)
80-
python-version: "3.11"
74+
python-version: "3.14"
8175
- uses: astral-sh/setup-uv@v6
8276
with:
8377
version-file: "requirements-tests.txt"

MAINTAINERS.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,12 @@ When rejecting a PR for a change for a future Python version, use a message
8888
like:
8989

9090
Thanks for contributing! Unfortunately, [as outlined in our CONTRIBUTING document](https://github.com/python/typeshed/blob/main/CONTRIBUTING.md#standard-library-stubs) we only accept pull requests to the standard library for future Python versions after the first beta version has been released. This is in part to prevent churn in the stubs, and in part because the testing infrastructure for the future version is not yet in place. Please feel free to open a new PR when the first beta version has been released. Alternatively, if this PR is still relevant, you can leave a comment here to reopen it.
91+
92+
### Closing requests for third-party stubs
93+
94+
We don't keep requests for third-party library stubs open. Close those
95+
requests as "not planned" with an explanation like this:
96+
97+
We gladly accept type stub contributions for third-party libraries that are published on PyPI in typeshed. To contribute a new library, please follow the steps outlined in [CONTRIBUTING.md](/python/typeshed/blob/main/CONTRIBUTING.md). The `create_baseline_stubs.py` script can be useful to create an initial version, suitable for inclusion in typeshed.
98+
99+
That said, we don't keep requests for third-party library stubs open, unless there are issues that need to be addressed before a PR can be opened. Therefore, I'm closing this issue.

pyrightconfig.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
// No effect in stubs
2929
"reportMissingSuperCall": "none",
3030
"reportUninitializedInstanceVariable": "none",
31-
// stdlib stubs trigger reportShadowedImports
32-
"reportShadowedImports": "none",
3331
// Stubs are allowed to use private variables
3432
"reportPrivateUsage": "none",
3533
// Stubs don't need the actual modules to be installed

pyrightconfig.scripts_and_tests.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"reportImplicitStringConcatenation": "none",
1515
// Extra strict settings
1616
"reportMissingModuleSource": "error",
17-
"reportShadowedImports": "error",
1817
"reportCallInDefaultInitializer": "error",
1918
"reportPropertyTypeMismatch": "error",
2019
"reportUninitializedInstanceVariable": "error",

pyrightconfig.stricter.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"stubs/boltons",
3131
"stubs/braintree",
3232
"stubs/cffi",
33+
"stubs/colorful",
3334
"stubs/dateparser",
3435
"stubs/defusedxml",
3536
"stubs/docker",
@@ -48,7 +49,8 @@
4849
"stubs/html5lib",
4950
"stubs/httplib2",
5051
"stubs/hvac",
51-
"stubs/icalendar",
52+
"stubs/icalendar/icalendar/prop.pyi",
53+
"stubs/icalendar/icalendar/timezone/provider.pyi",
5254
"stubs/jsonschema",
5355
"stubs/jwcrypto",
5456
"stubs/ldap3",
@@ -71,15 +73,14 @@
7173
"stubs/pika",
7274
"stubs/pony",
7375
"stubs/protobuf",
74-
"stubs/psutil",
76+
"stubs/psutil/psutil/__init__.pyi",
7577
"stubs/psycopg2",
7678
"stubs/pyasn1",
7779
"stubs/pycurl",
7880
"stubs/Pygments",
7981
"stubs/PyMySQL",
8082
"stubs/python-dateutil",
8183
"stubs/python-jose",
82-
"stubs/pytz/pytz/lazy.pyi",
8384
"stubs/pywin32",
8485
"stubs/PyYAML",
8586
"stubs/reportlab",
@@ -108,8 +109,6 @@
108109
// No effect in stubs
109110
"reportMissingSuperCall": "none",
110111
"reportUninitializedInstanceVariable": "none",
111-
// stdlib stubs trigger reportShadowedImports
112-
"reportShadowedImports": "none",
113112
// Stubs are allowed to use private variables
114113
"reportPrivateUsage": "none",
115114
// Stubs don't need the actual modules to be installed

pyrightconfig.testcases.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
],
77
"typeCheckingMode": "strict",
88
// Extra strict settings
9-
"reportShadowedImports": "error", // Don't accidentally name a file something that shadows stdlib
109
"reportImplicitStringConcatenation": "error",
1110
"reportUninitializedInstanceVariable": "error",
1211
"reportUnnecessaryTypeIgnoreComment": "error",

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

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,6 @@
1-
# =======
2-
# <= 3.12
3-
# =======
4-
5-
# Added in Python 3.10.18 (parameter `escapable`)
6-
html.parser.HTMLParser.set_cdata_mode
7-
8-
9-
# =======
10-
# <= 3.11
11-
# =======
12-
13-
# Added in Python 3.10.15
14-
email._header_value_parser.NLSET
15-
email._header_value_parser.SPECIALSNL
16-
email.errors.HeaderWriteError
17-
email.utils.getaddresses
18-
email.utils.parseaddr
19-
20-
21-
# =======
22-
# <= 3.10
23-
# =======
1+
# =========
2+
# Temporary
3+
# =========
244

255
# Incompatible changes introduced in Python 3.10.12
266
# (Remove once 3.10.12 becomes available for GitHub Actions)
@@ -38,8 +18,8 @@ tarfile.data_filter
3818
tarfile.fully_trusted_filter
3919
tarfile.tar_filter
4020

41-
# Incompatible changes introduced in Python 3.9.14
42-
# (Remove once 3.9.14 becomes available for GitHub Actions)
21+
# Incompatible changes introduced in Python 3.10.14
22+
# (Remove once 3.10.14 becomes available for GitHub Actions)
4323
pyexpat.XMLParserType.GetReparseDeferralEnabled
4424
pyexpat.XMLParserType.SetReparseDeferralEnabled
4525
xml.etree.ElementTree.XMLParser.flush
@@ -51,6 +31,45 @@ xml.parsers.expat.XMLParserType.SetReparseDeferralEnabled
5131
xml.sax.expatreader.ExpatParser.flush
5232
zipfile.ZipInfo.__slots__
5333

34+
# Incompatible changes introduced in Python 3.10.15
35+
# (Remove once 3.10.15 becomes available for GitHub Actions)
36+
email._header_value_parser.NLSET
37+
email._header_value_parser.SPECIALSNL
38+
email.errors.HeaderWriteError
39+
email.utils.getaddresses
40+
email.utils.parseaddr
41+
42+
# Incompatible changes introduced in Python 3.10.17
43+
# (Remove once 3.10.17 becomes available for GitHub Actions)
44+
email._header_value_parser.get_encoded_word
45+
email._header_value_parser.make_quoted_pairs
46+
47+
# Incompatible changes introduced in Python 3.10.18
48+
# (Remove once 3.10.18 becomes available for GitHub Actions)
49+
html.parser.HTMLParser.set_cdata_mode # parameter `escapable`
50+
genericpath.__all__
51+
genericpath.ALLOW_MISSING
52+
(ntpath.__all__)?
53+
(ntpath.ALLOW_MISSING)?
54+
(ntpath.realpath)?
55+
(os.path.__all__)?
56+
(os.path.ALLOW_MISSING)?
57+
(os.path.realpath)?
58+
(posixpath.__all__)?
59+
(posixpath.ALLOW_MISSING)?
60+
(posixpath.realpath)?
61+
tarfile.LinkFallbackError
62+
tarfile.TarFile._extract_member
63+
tarfile.TarFile.makelink_with_filter
64+
65+
# Incompatible changes introduced in Python 3.10.20
66+
# (Remove once 3.10.20 becomes available for GitHub Actions)
67+
html.parser.HTMLParser.__init__ # parameter `scripting`
68+
pyexpat.XMLParserType.SetAllocTrackerActivationThreshold
69+
pyexpat.XMLParserType.SetAllocTrackerMaximumAmplification
70+
xml.parsers.expat.XMLParserType.SetAllocTrackerActivationThreshold
71+
xml.parsers.expat.XMLParserType.SetAllocTrackerMaximumAmplification
72+
5473

5574
# =============================================================
5675
# Allowlist entries that cannot or should not be fixed; <= 3.12

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

Lines changed: 44 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
# =========
2+
# Temporary
3+
# =========
4+
5+
# Incompatible changes introduced in Python 3.11.10
6+
# (Remove once 3.11.10 becomes available for GitHub Actions)
7+
email._header_value_parser.NLSET
8+
email._header_value_parser.SPECIALSNL
9+
email.errors.HeaderWriteError
10+
email.utils.getaddresses
11+
email.utils.parseaddr
12+
13+
# Incompatible changes introduced in Python 3.11.12
14+
# (Remove once 3.11.12 becomes available for GitHub Actions)
15+
email._header_value_parser.get_encoded_word
16+
email._header_value_parser.make_quoted_pairs
17+
18+
# Incompatible changes introduced in Python 3.11.13
19+
# (Remove once 3.11.13 becomes available for GitHub Actions)
20+
html.parser.HTMLParser.set_cdata_mode # parameter `escapable`
21+
genericpath.__all__
22+
genericpath.ALLOW_MISSING
23+
(ntpath.__all__)?
24+
(ntpath.ALLOW_MISSING)?
25+
(ntpath.realpath)?
26+
(os.path.__all__)?
27+
(os.path.ALLOW_MISSING)?
28+
(os.path.realpath)?
29+
(posixpath.__all__)?
30+
(posixpath.ALLOW_MISSING)?
31+
(posixpath.realpath)?
32+
tarfile.LinkFallbackError
33+
tarfile.TarFile._extract_member
34+
tarfile.TarFile.makelink_with_filter
35+
36+
# Incompatible changes introduced in Python 3.11.15
37+
# (Remove once 3.11.15 becomes available for GitHub Actions)
38+
html.parser.HTMLParser.__init__ # parameter `scripting`
39+
pyexpat.XMLParserType.SetAllocTrackerActivationThreshold
40+
pyexpat.XMLParserType.SetAllocTrackerMaximumAmplification
41+
xml.parsers.expat.XMLParserType.SetAllocTrackerActivationThreshold
42+
xml.parsers.expat.XMLParserType.SetAllocTrackerMaximumAmplification
43+
44+
145
# ============
246
# 3.11 to 3.12
347
# ============
@@ -8,26 +52,6 @@ fcntl.F_OFD_SETLK
852
fcntl.F_OFD_SETLKW
953

1054

11-
# =======
12-
# <= 3.12
13-
# =======
14-
15-
# Added in Python 3.11.13 (parameter `escapable`)
16-
html.parser.HTMLParser.set_cdata_mode
17-
18-
19-
# =======
20-
# <= 3.11
21-
# =======
22-
23-
# Added in Python 3.11.10
24-
email._header_value_parser.NLSET
25-
email._header_value_parser.SPECIALSNL
26-
email.errors.HeaderWriteError
27-
email.utils.getaddresses
28-
email.utils.parseaddr
29-
30-
3155
# =============================================================
3256
# Allowlist entries that cannot or should not be fixed; <= 3.12
3357
# =============================================================

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

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
# =========
2+
# Temporary
3+
# =========
4+
5+
# Incompatible changes introduced in Python 3.12.11
6+
# (Remove once 3.12.11 becomes available for GitHub Actions)
7+
html.parser.HTMLParser.set_cdata_mode # parameter `escapable`
8+
genericpath.__all__
9+
genericpath.ALLOW_MISSING
10+
(ntpath.__all__)?
11+
(ntpath.ALLOW_MISSING)?
12+
(ntpath.realpath)?
13+
(os.path.__all__)?
14+
(os.path.ALLOW_MISSING)?
15+
(os.path.realpath)?
16+
(posixpath.__all__)?
17+
(posixpath.ALLOW_MISSING)?
18+
(posixpath.realpath)?
19+
tarfile.LinkFallbackError
20+
tarfile.TarFile._extract_member
21+
tarfile.TarFile.makelink_with_filter
22+
23+
# Incompatible changes introduced in Python 3.12.13
24+
# (Remove once 3.12.13 becomes available for GitHub Actions)
25+
html.parser.HTMLParser.__init__ # parameter `scripting`
26+
pyexpat.XMLParserType.SetAllocTrackerActivationThreshold
27+
pyexpat.XMLParserType.SetAllocTrackerMaximumAmplification
28+
xml.parsers.expat.XMLParserType.SetAllocTrackerActivationThreshold
29+
xml.parsers.expat.XMLParserType.SetAllocTrackerMaximumAmplification
30+
31+
132
# ============
233
# 3.11 to 3.12
334
# ============
@@ -8,14 +39,6 @@ fcntl.F_OFD_SETLK
839
fcntl.F_OFD_SETLKW
940

1041

11-
# =======
12-
# <= 3.12
13-
# =======
14-
15-
# Added in Python 3.12.11 (parameter `escapable`)
16-
html.parser.HTMLParser.set_cdata_mode
17-
18-
1942
# =============================================================
2043
# Allowlist entries that cannot or should not be fixed; <= 3.12
2144
# =============================================================

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,3 @@
33
# =======
44

55
(mmap.MAP_32BIT)? # Exists locally on MacOS but not on GitHub
6-
7-
# ================
8-
# Unclear problems
9-
# ================
10-
11-
# Added in 3.11.1, flagged by stubtest on Python < 3.14 for unknown reasons
12-
errno.ENOTCAPABLE

0 commit comments

Comments
 (0)