Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3ef5287

Browse files
skirpichevskirpichev
committed
Merge branch 'master' into complex-float-arith-69639
2 parents badf492 + 8c22eba commit 3ef5287

73 files changed

Lines changed: 952 additions & 601 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ Modules/_interp*module.c @ericsnowcurrently
255255
Lib/test/test_interpreters/ @ericsnowcurrently
256256

257257
# Android
258-
**/*Android* @mhsmith
259-
**/*android* @mhsmith
258+
**/*Android* @mhsmith @freakboy3742
259+
**/*android* @mhsmith @freakboy3742
260260

261261
# iOS (but not termios)
262262
**/iOS* @freakboy3742
@@ -267,7 +267,7 @@ Lib/test/test_interpreters/ @ericsnowcurrently
267267
**/*-ios* @freakboy3742
268268

269269
# WebAssembly
270-
/Tools/wasm/ @brettcannon
270+
/Tools/wasm/ @brettcannon @freakboy3742
271271

272272
# SBOM
273273
/Misc/externals.spdx.json @sethmlarson

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ jobs:
468468
- name: Display build info
469469
run: make pythoninfo
470470
- name: Tests
471-
run: xvfb-run make test
471+
run: xvfb-run make ci
472472

473473
build_tsan:
474474
name: 'Thread sanitizer'

‎.github/workflows/jit.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- true
6262
- false
6363
llvm:
64-
- 18
64+
- 19
6565
include:
6666
- target: i686-pc-windows-msvc/msvc
6767
architecture: Win32
@@ -121,10 +121,15 @@ jobs:
121121
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
122122
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
123123
124+
# The `find` line is required as a result of https://github.com/actions/runner-images/issues/9966.
125+
# This is a bug in the macOS runner image where the pre-installed Python is installed in the same
126+
# directory as the Homebrew Python, which causes the build to fail for macos-13. This line removes
127+
# the symlink to the pre-installed Python so that the Homebrew Python is used instead.
124128
- name: Native macOS
125129
if: runner.os == 'macOS'
126130
run: |
127131
brew update
132+
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
128133
brew install llvm@${{ matrix.llvm }}
129134
SDKROOT="$(xcrun --show-sdk-path)" \
130135
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
@@ -165,15 +170,19 @@ jobs:
165170
name: Free-Threaded (Debug)
166171
needs: interpreter
167172
runs-on: ubuntu-latest
173+
strategy:
174+
matrix:
175+
llvm:
176+
- 19
168177
steps:
169178
- uses: actions/checkout@v4
170179
- uses: actions/setup-python@v5
171180
with:
172181
python-version: '3.11'
173182
- name: Build with JIT enabled and GIL disabled
174183
run: |
175-
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 18
176-
export PATH="$(llvm-config-18 --bindir):$PATH"
184+
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }}
185+
export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH"
177186
./configure --enable-experimental-jit --with-pydebug --disable-gil
178187
make all --jobs 4
179188
- name: Run tests

‎.github/workflows/reusable-macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ jobs:
6969
--fail-on-improvement
7070
--path-prefix="./"
7171
- name: Tests
72-
run: make test
72+
run: make ci

‎.github/workflows/reusable-ubuntu.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,4 @@ jobs:
105105
run: sudo mount "$CPYTHON_RO_SRCDIR" -oremount,rw
106106
- name: Tests
107107
working-directory: ${{ env.CPYTHON_BUILDDIR }}
108-
run: xvfb-run make test
108+
run: xvfb-run make ci

‎Doc/c-api/typeobj.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ slot typedefs
355355
+-----------------------------+-----------------------------+----------------------+
356356
| :c:type:`newfunc` | .. line-block:: | :c:type:`PyObject` * |
357357
| | | |
358-
| | :c:type:`PyObject` * | |
358+
| | :c:type:`PyTypeObject` * | |
359359
| | :c:type:`PyObject` * | |
360360
| | :c:type:`PyObject` * | |
361361
+-----------------------------+-----------------------------+----------------------+
@@ -2647,7 +2647,7 @@ Slot Type typedefs
26472647
26482648
See :c:member:`~PyTypeObject.tp_free`.
26492649

2650-
.. c:type:: PyObject *(*newfunc)(PyObject *, PyObject *, PyObject *)
2650+
.. c:type:: PyObject *(*newfunc)(PyTypeObject *, PyObject *, PyObject *)
26512651
26522652
See :c:member:`~PyTypeObject.tp_new`.
26532653

0 commit comments

Comments
 (0)