Skip to content

Commit 448b0ba

Browse files
committed
Merge remote-tracking branch 'upstream/main' into hacl/HMAC-99108
2 parents 12fbfc4 + 403410f commit 448b0ba

File tree

202 files changed

+6078
-2303
lines changed

Some content is hidden

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

202 files changed

+6078
-2303
lines changed

.azure-pipelines/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
displayName: Pre-build checks
66

77
pool:
8-
vmImage: ubuntu-22.04
8+
vmImage: ubuntu-24.04
99

1010
steps:
1111
- template: ./prebuild-checks.yml

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
name: 'Check if generated files are up to date'
8989
# Don't use ubuntu-latest but a specific version to make the job
9090
# reproducible: to get the same tools versions (autoconf, aclocal, ...)
91-
runs-on: ubuntu-22.04
91+
runs-on: ubuntu-24.04
9292
timeout-minutes: 60
9393
needs: check_source
9494
if: needs.check_source.outputs.run_tests == 'true'
@@ -237,7 +237,7 @@ jobs:
237237
strategy:
238238
fail-fast: false
239239
matrix:
240-
os: [ubuntu-22.04]
240+
os: [ubuntu-24.04]
241241
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
242242
env:
243243
OPENSSL_VER: ${{ matrix.openssl_ver }}
@@ -297,7 +297,7 @@ jobs:
297297

298298
test_hypothesis:
299299
name: "Hypothesis tests on Ubuntu"
300-
runs-on: ubuntu-22.04
300+
runs-on: ubuntu-24.04
301301
timeout-minutes: 60
302302
needs: check_source
303303
if: needs.check_source.outputs.run_tests == 'true' && needs.check_source.outputs.run_hypothesis == 'true'
@@ -417,7 +417,7 @@ jobs:
417417
if: needs.check_source.outputs.run_tests == 'true'
418418
strategy:
419419
matrix:
420-
os: [ubuntu-22.04]
420+
os: [ubuntu-24.04]
421421
env:
422422
OPENSSL_VER: 3.0.15
423423
PYTHONSTRICTEXTENSIONBUILD: 1

.github/workflows/jit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ jobs:
131131
brew update
132132
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
133133
brew install llvm@${{ matrix.llvm }}
134-
SDKROOT="$(xcrun --show-sdk-path)" \
135-
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
134+
export SDKROOT="$(xcrun --show-sdk-path)"
135+
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
136136
make all --jobs 4
137137
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
138138

.github/workflows/posix-deps-apt.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ apt-get -yq install \
1313
libgdbm-dev \
1414
libgdbm-compat-dev \
1515
liblzma-dev \
16-
libmpdec-dev \
1716
libncurses5-dev \
1817
libreadline6-dev \
1918
libsqlite3-dev \

.github/workflows/reusable-tsan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
jobs:
2222
build_tsan_reusable:
2323
name: 'Thread sanitizer'
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2525
timeout-minutes: 60
2626
steps:
2727
- uses: actions/checkout@v4

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
os: [ubuntu-22.04]
23+
os: [ubuntu-24.04]
2424
env:
2525
FORCE_COLOR: 1
2626
OPENSSL_VER: 3.0.15

.github/workflows/reusable-wasi.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
build_wasi_reusable:
1212
name: 'build and test'
1313
timeout-minutes: 60
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-24.04
1515
env:
1616
WASMTIME_VERSION: 22.0.0
1717
WASI_SDK_VERSION: 24
1818
WASI_SDK_PATH: /opt/wasi-sdk
1919
CROSS_BUILD_PYTHON: cross-build/build
20-
CROSS_BUILD_WASI: cross-build/wasm32-wasi
20+
CROSS_BUILD_WASI: cross-build/wasm32-wasip1
2121
steps:
2222
- uses: actions/checkout@v4
2323
# No problem resolver registered as one doesn't currently exist for Clang.
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
path: ${{ env.WASI_SDK_PATH }}
3333
key: ${{ runner.os }}-wasi-sdk-${{ env.WASI_SDK_VERSION }}
34-
- name: "Install WASI SDK"
34+
- name: "Install WASI SDK" # Hard-coded to x64.
3535
if: steps.cache-wasi-sdk.outputs.cache-hit != 'true'
3636
run: |
3737
mkdir ${{ env.WASI_SDK_PATH }} && \

Doc/c-api/allocation.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ Allocating Objects on the Heap
1515
.. c:function:: PyObject* PyObject_Init(PyObject *op, PyTypeObject *type)
1616
1717
Initialize a newly allocated object *op* with its type and initial
18-
reference. Returns the initialized object. If *type* indicates that the
19-
object participates in the cyclic garbage detector, it is added to the
20-
detector's set of observed objects. Other fields of the object are not
21-
affected.
18+
reference. Returns the initialized object. Other fields of the object are
19+
not affected.
2220
2321
2422
.. c:function:: PyVarObject* PyObject_InitVar(PyVarObject *op, PyTypeObject *type, Py_ssize_t size)

Doc/c-api/typeobj.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2230,7 +2230,7 @@ This is done by filling a :c:type:`PyType_Spec` structure and calling
22302230
.. _number-structs:
22312231

22322232
Number Object Structures
2233-
========================
2233+
------------------------
22342234

22352235
.. sectionauthor:: Amaury Forgeot d'Arc
22362236

@@ -2344,7 +2344,7 @@ Number Object Structures
23442344
.. _mapping-structs:
23452345

23462346
Mapping Object Structures
2347-
=========================
2347+
-------------------------
23482348

23492349
.. sectionauthor:: Amaury Forgeot d'Arc
23502350

@@ -2381,7 +2381,7 @@ Mapping Object Structures
23812381
.. _sequence-structs:
23822382

23832383
Sequence Object Structures
2384-
==========================
2384+
--------------------------
23852385

23862386
.. sectionauthor:: Amaury Forgeot d'Arc
23872387

@@ -2461,7 +2461,7 @@ Sequence Object Structures
24612461
.. _buffer-structs:
24622462

24632463
Buffer Object Structures
2464-
========================
2464+
------------------------
24652465

24662466
.. sectionauthor:: Greg J. Stein <[email protected]>
24672467
.. sectionauthor:: Benjamin Peterson
@@ -2556,7 +2556,7 @@ Buffer Object Structures
25562556

25572557

25582558
Async Object Structures
2559-
=======================
2559+
-----------------------
25602560

25612561
.. sectionauthor:: Yury Selivanov <[email protected]>
25622562

@@ -2624,7 +2624,7 @@ Async Object Structures
26242624
.. _slot-typedefs:
26252625

26262626
Slot Type typedefs
2627-
==================
2627+
------------------
26282628

26292629
.. c:type:: PyObject *(*allocfunc)(PyTypeObject *cls, Py_ssize_t nitems)
26302630
@@ -2733,7 +2733,7 @@ Slot Type typedefs
27332733
.. _typedef-examples:
27342734

27352735
Examples
2736-
========
2736+
--------
27372737

27382738
The following are simple examples of Python type definitions. They
27392739
include common usage you may encounter. Some demonstrate tricky corner

Doc/deprecations/pending-removal-in-3.14.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,6 @@ Pending removal in Python 3.14
103103
if :ref:`named placeholders <sqlite3-placeholders>` are used and
104104
*parameters* is a sequence instead of a :class:`dict`.
105105

106-
* date and datetime adapter, date and timestamp converter:
107-
see the :mod:`sqlite3` documentation for suggested replacement recipes.
108-
109-
* :class:`types.CodeType`: Accessing :attr:`~codeobject.co_lnotab` was
110-
deprecated in :pep:`626`
111-
since 3.10 and was planned to be removed in 3.12,
112-
but it only got a proper :exc:`DeprecationWarning` in 3.12.
113-
May be removed in 3.14.
114-
(Contributed by Nikita Sobolev in :gh:`101866`.)
115-
116106
* :mod:`typing`: :class:`!typing.ByteString`, deprecated since Python 3.9,
117107
now causes a :exc:`DeprecationWarning` to be emitted when it is used.
118108

0 commit comments

Comments
 (0)