Skip to content

Commit 07575d8

Browse files
Merge branch '3.14' into backport-24b8f12-3.14
2 parents ad6d59f + c078637 commit 07575d8

439 files changed

Lines changed: 7723 additions & 4169 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Lib/test/test_ast/ @eclips4
213213
**/*multiprocessing* @gpshead
214214

215215
# SQLite 3
216-
**/*sqlite* @berkerpeksag @erlend-aasland
216+
**/*sqlite* @erlend-aasland
217217

218218
# subprocess
219219
/Lib/subprocess.py @gpshead

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ jobs:
423423
needs: build-context
424424
if: needs.build-context.outputs.run-ubuntu == 'true'
425425
env:
426-
OPENSSL_VER: 3.0.20
426+
OPENSSL_VER: 3.5.6
427427
PYTHONSTRICTEXTENSIONBUILD: 1
428428
steps:
429429
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -531,7 +531,7 @@ jobs:
531531
matrix:
532532
os: [ubuntu-24.04]
533533
env:
534-
OPENSSL_VER: 3.0.20
534+
OPENSSL_VER: 3.5.6
535535
PYTHONSTRICTEXTENSIONBUILD: 1
536536
ASAN_OPTIONS: detect_leaks=0:allocator_may_return_null=1:handle_segv=0
537537
steps:

.github/workflows/documentation-links.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.github/workflows/mypy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ jobs:
6868
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6969
with:
7070
persist-credentials: false
71-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
71+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
7272
with:
7373
python-version: "3.13"
74-
cache: pip
75-
cache-dependency-path: Tools/requirements-dev.txt
76-
- run: pip install -r Tools/requirements-dev.txt
74+
activate-environment: true
75+
cache-dependency-glob: Tools/requirements-dev.txt
76+
- run: uv pip install -r Tools/requirements-dev.txt
7777
- run: python3 Misc/mypy/make_symlinks.py --symlink
78-
- run: mypy --config-file ${{ matrix.target }}/mypy.ini
78+
- run: mypy --num-workers 4 --config-file ${{ matrix.target }}/mypy.ini

.github/workflows/reusable-macos.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ jobs:
3838
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
3939
- name: Install Homebrew dependencies
4040
run: |
41-
brew install pkg-config openssl@3.0 xz gdbm tcl-tk@8 make
41+
brew bundle --file=Misc/Brewfile
42+
brew install make
4243
# Because alternate versions are not symlinked into place by default:
4344
brew link --overwrite tcl-tk@8
4445
- name: Configure CPython

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ${{ inputs.os }}
3131
timeout-minutes: 60
3232
env:
33-
OPENSSL_VER: 3.0.20
33+
OPENSSL_VER: 3.5.6
3434
PYTHONSTRICTEXTENSIONBUILD: 1
3535
TERM: linux
3636
steps:

Android/android.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def unpack_deps(host, prefix_dir, cache_dir):
216216
for name_ver in [
217217
"bzip2-1.0.8-3",
218218
"libffi-3.4.4-3",
219-
"openssl-3.0.20-0",
219+
"openssl-3.5.6-0",
220220
"sqlite-3.50.4-0",
221221
"xz-5.4.6-1",
222222
"zstd-1.5.7-2"

Apple/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def unpack_deps(
319319
for name_ver in [
320320
"BZip2-1.0.8-2",
321321
"libFFI-3.4.7-2",
322-
"OpenSSL-3.0.20-1",
322+
"OpenSSL-3.5.6-1",
323323
"XZ-5.6.4-2",
324324
"mpdecimal-4.0.0-2",
325325
"zstd-1.5.7-1",

Apple/testbed/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
LOG_PREFIX_REGEX = re.compile(
2222
r"^\d{4}-\d{2}-\d{2}" # YYYY-MM-DD
2323
r"\s+\d+:\d{2}:\d{2}\.\d+\+\d{4}" # HH:MM:SS.ssssss+ZZZZ
24-
r"\s+iOSTestbed\[\d+:\w+\]" # Process/thread ID
24+
r"\s+iOSTestbed\[\d+:\w+\] " # Process/thread ID
2525
)
2626

2727

Doc/c-api/exceptions.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ an error value).
412412
413413
.. c:function:: int PyErr_WarnFormat(PyObject *category, Py_ssize_t stack_level, const char *format, ...)
414414
415-
Function similar to :c:func:`PyErr_WarnEx`, but use
415+
Function similar to :c:func:`PyErr_WarnEx`, but uses
416416
:c:func:`PyUnicode_FromFormat` to format the warning message. *format* is
417417
an ASCII-encoded string.
418418

0 commit comments

Comments
 (0)