Skip to content

Commit 1dec18a

Browse files
committed
Merge branch 'main' into add-py-jit
2 parents c83ea49 + b19d12f commit 1dec18a

File tree

342 files changed

+8613
-3512
lines changed

Some content is hidden

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

342 files changed

+8613
-3512
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/CODEOWNERS

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ Objects/exceptions.c @iritkatriel
8888
**/sha* @gpshead @tiran
8989
Modules/md5* @gpshead @tiran
9090
**/*blake* @gpshead @tiran
91-
Modules/_blake2/** @gpshead @tiran
9291
Modules/_hacl/** @gpshead
9392

9493
# logging
@@ -255,8 +254,8 @@ Modules/_interp*module.c @ericsnowcurrently
255254
Lib/test/test_interpreters/ @ericsnowcurrently
256255

257256
# Android
258-
**/*Android* @mhsmith
259-
**/*android* @mhsmith
257+
**/*Android* @mhsmith @freakboy3742
258+
**/*android* @mhsmith @freakboy3742
260259

261260
# iOS (but not termios)
262261
**/iOS* @freakboy3742
@@ -267,7 +266,7 @@ Lib/test/test_interpreters/ @ericsnowcurrently
267266
**/*-ios* @freakboy3742
268267

269268
# WebAssembly
270-
/Tools/wasm/ @brettcannon
269+
/Tools/wasm/ @brettcannon @freakboy3742
271270

272271
# SBOM
273272
/Misc/externals.spdx.json @sethmlarson

.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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ concurrency:
2828
jobs:
2929
interpreter:
3030
name: Interpreter (Debug)
31-
runs-on: ubuntu-latest
31+
runs-on: ubuntu-22.04
3232
timeout-minutes: 90
3333
steps:
3434
- uses: actions/checkout@v4
@@ -85,19 +85,19 @@ jobs:
8585
compiler: clang
8686
- target: x86_64-unknown-linux-gnu/gcc
8787
architecture: x86_64
88-
runner: ubuntu-latest
88+
runner: ubuntu-22.04
8989
compiler: gcc
9090
- target: x86_64-unknown-linux-gnu/clang
9191
architecture: x86_64
92-
runner: ubuntu-latest
92+
runner: ubuntu-22.04
9393
compiler: clang
9494
- target: aarch64-unknown-linux-gnu/gcc
9595
architecture: aarch64
96-
runner: ubuntu-latest
96+
runner: ubuntu-22.04
9797
compiler: gcc
9898
- target: aarch64-unknown-linux-gnu/clang
9999
architecture: aarch64
100-
runner: ubuntu-latest
100+
runner: ubuntu-22.04
101101
compiler: clang
102102
env:
103103
CC: ${{ matrix.compiler }}
@@ -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
@@ -169,7 +169,7 @@ jobs:
169169
jit-with-disabled-gil:
170170
name: Free-Threaded (Debug)
171171
needs: interpreter
172-
runs-on: ubuntu-latest
172+
runs-on: ubuntu-22.04
173173
strategy:
174174
matrix:
175175
llvm:

.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/conversion.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ The following functions provide locale-independent string to number conversions.
105105
106106
If ``s`` represents a value that is too large to store in a float
107107
(for example, ``"1e500"`` is such a string on many platforms) then
108-
if ``overflow_exception`` is ``NULL`` return ``Py_HUGE_VAL`` (with
108+
if ``overflow_exception`` is ``NULL`` return ``Py_INFINITY`` (with
109109
an appropriate sign) and don't set any exception. Otherwise,
110110
``overflow_exception`` must point to a Python exception object;
111111
raise that exception and return ``-1.0``. In both cases, set

0 commit comments

Comments
 (0)