8000 Rebase against main. · python/cpython@67c91ba · GitHub
[go: up one dir, main page]
Skip to content

Commit 67c91ba

Browse files
ZeroIntensityZeroIntensity
committed
Rebase against main.
2 parents d5dafd1 + 15d6506 commit 67c91ba

File tree

129 files changed

+3842
-1068
lines changed

Some content is hidden

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

129 files changed

+3842
-1068
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ jobs:
250250
fail-fast: false
251251
matrix:
252252
os: [ubuntu-24.04]
253-
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
253+
openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2, 3.4.0]
254+
# See Tools/ssl/make_ssl_data.py for notes on adding a new version
254255
env:
255256
OPENSSL_VER: ${{ matrix.openssl_ver }}
256257
MULTISSL_DIR: ${{ github.workspace }}/multissl

‎.github/workflows/jit.yml

Lines changed: 7 additions & 28 deletions
93C6
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ jobs:
5454
- x86_64-apple-darwin/clang
5555
- aarch64-apple-darwin/clang
5656
- x86_64-unknown-linux-gnu/gcc
57-
- x86_64-unknown-linux-gnu/clang
5857
- aarch64-unknown-linux-gnu/gcc
59-
- aarch64-unknown-linux-gnu/clang
6058
debug:
6159
- true
6260
- false
@@ -66,41 +64,24 @@ jobs:
6664
- target: i686-pc-windows-msvc/msvc
6765
architecture: Win32
6866
runner: windows-latest
69-
compiler: msvc
7067
- target: x86_64-pc-windows-msvc/msvc
7168
architecture: x64
7269
runner: windows-latest
73-
compiler: msvc
7470
- target: aarch64-pc-windows-msvc/msvc
7571
architecture: ARM64
7672
runner: windows-latest
77-
compiler: msvc
7873
- target: x86_64-apple-darwin/clang
7974
architecture: x86_64
8075
runner: macos-13
81-
compiler: clang
8276
- target: aarch64-apple-darwin/clang
8377
architecture: aarch64
8478
runner: macos-14
85-
compiler: clang
8679
- target: x86_64-unknown-linux-gnu/gcc
8780
architecture: x86_64
8881
runner: ubuntu-22.04
89-
compiler: gcc
90-
- target: x86_64-unknown-linux-gnu/clang
91-
architecture: x86_64
92-
runner: ubuntu-22.04
93-
compiler: clang
9482
- target: aarch64-unknown-linux-gnu/gcc
9583
architecture: aarch64
9684
runner: ubuntu-22.04
97-
compiler: gcc
98-
- target: aarch64-unknown-linux-gnu/clang
99-
architecture: aarch64
100-
runner: ubuntu-22.04
101-
compiler: clang
102-
env:
103-
CC: ${{ matrix.compiler }}
10485
steps:
10586
- uses: actions/checkout@v4
10687
- uses: actions/setup-python@v5
@@ -111,10 +92,10 @@ jobs:
11192
if: runner.os == 'Windows' && matrix.architecture != 'ARM64'
11293
run: |
11394
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
114-
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '--pgo' }} -p ${{ matrix.architecture }}
95+
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
11596
./PCbuild/rt.bat ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }} -q --multiprocess 0 --timeout 4500 --verbose2 --verbose3
11697
117-
# No PGO or tests (yet):
98+
# No tests (yet):
11899
- name: Emulated Windows
119100
if: runner.os == 'Windows' && matrix.architecture == 'ARM64'
120101
run: |
@@ -132,7 +113,7 @@ jobs:
132113
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
133114
brew install llvm@${{ matrix.llvm }}
134115
export SDKROOT="$(xcrun --show-sdk-path)"
135-
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
116+
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '' }}
136117
make all --jobs 4
137118
./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
138119
@@ -141,7 +122,7 @@ jobs:
141122
run: |
142123
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh ${{ matrix.llvm }}
143124
export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH"
144-
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
125+
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '' }}
145126
make all --jobs 4
146127
./python -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3
147128
@@ -156,13 +137,11 @@ jobs:
156137
make clean --jobs 4
157138
export HOST=${{ matrix.architecture }}-linux-gnu
158139
sudo apt install --yes "gcc-$HOST" qemu-user
159-
${{ !matrix.debug && matrix.compiler == 'clang' && './configure --enable-optimizations' || '' }}
160-
${{ !matrix.debug && matrix.compiler == 'clang' && 'make profile-run-stamp --jobs 4' || '' }}
161140
export QEMU_LD_PREFIX="/usr/$HOST"
162-
CC="${{ matrix.compiler == 'clang' && 'clang --target=$HOST' || '$HOST-gcc' }}" \
163-
CPP="$CC --preprocess" \
141+
CC="$HOST-gcc" \
142+
CPP="$HOST-gcc --preprocess" \
164143
HOSTRUNNER=qemu-${{ matrix.architecture }} \
165-
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--with-lto' }} --build=x86_64-linux-gnu --host="$HOST" --with-build-python=../build/bin/python3 --with-pkg-config=no ac_cv_buggy_getaddrinfo=no ac_cv_file__dev_ptc=no ac_cv_file__dev_ptmx=yes
144+
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '' }} --build=x86_64-linux-gnu --host="$HOST" --with-build-python=../build/bin/python3 --with-pkg-config=no ac_cv_buggy_getaddrinfo=no ac_cv_file__dev_ptc=no ac_cv_file__dev_ptmx=yes
166145
make all --jobs 4
167146
./python -m test --ignorefile=Tools/jit/ignore-tests-emulated-linux.txt --multiprocess 0 --timeout 4500 --verbose2 --verbose3
168147

‎.github/workflows/reusable-macos.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ jobs:
3737
path: config.cache
3838
key: ${{ github.job }}-${{ inputs.os }}-${{ env.IMAGE_VERSION }}-${{ inputs.config_hash }}
3939
- name: Install Homebrew dependencies
40-
run: brew install pkg-config openssl@3.0 xz gdbm tcl-tk make
40+
run: |
41+
brew install pkg-config openssl@3.0 xz gdbm tcl-tk@8 make
42+
# Because alternate versions are not symlinked into place by default:
43+
brew link tcl-tk@8
4144
- name: Configure CPython
4245
run: |
4346
GDBM_CFLAGS="-I$(brew --prefix gdbm)/include" \

‎Doc/c-api/complex.rst

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,36 @@ pointers. This is consistent throughout the API.
4444
representation.
4545
4646
47+
.. c:function:: Py_complex _Py_cr_sum(Py_complex left, double right)
48+
49+
Return the sum of a complex number and a real number, using the C :c:type:`Py_complex`
50+
representation.
51+
52+
.. versionadded:: 3.14
53+
54+
4755
.. c:function:: Py_complex _Py_c_diff(Py_complex left, Py_complex right)
4856
4957
Return the difference between two complex numbers, using the C
5058
:c:type:`Py_complex` representation.
5159
5260
61+
.. c:function:: Py_complex _Py_cr_diff(Py_complex left, double right)
62+
63+
Return the difference between a complex number and a real number, using the C
64+
:c:type:`Py_complex` representation.
65+
66+
.. versionadded:: 3.14
67+
68+
69+
.. c:function:: Py_complex _Py_rc_diff(double left, Py_complex right)
70+
71+
Return the difference between a real number and a complex number, using the C
72+
:c:type:`Py_complex` representation.
73+
74+
.. versionadded:: 3.14
75+
76+
5377
.. c:function:: Py_complex _Py_c_neg(Py_complex num)
5478
5579
Return the negation of the complex number *num*, using the C
@@ -62,6 +86,14 @@ pointers. This is consistent throughout the API.
6286
representation.
6387
6488
89+
.. c:function:: Py_complex _Py_cr_prod(Py_complex left, double right)
90+
91+
Return the product of a complex number and a real number, using the C
92+
:c:type:`Py_complex` representation.
93+
94+
.. versionadded:: 3.14
95+
96+
6597
.. c:function:: Py_complex _Py_c_quot(Py_complex dividend, Py_complex divisor)
6698
6799
Return the quotient of two complex numbers, using the C :c:type:`Py_complex`
@@ -71,6 +103,28 @@ pointers. This is consistent throughout the API.
71103
:c:data:`errno` to :c:macro:`!EDOM`.
72104
73105
106+
.. c:function:: Py_complex _Py_cr_quot(Py_complex dividend, double divisor)
107+
108+
Return the quotient of a complex number and a real number, using the C
109+
:c:type:`Py_complex` representation.
110+
111+
If *divisor* is zero, this method returns zero and sets
112+
:c:data:`errno` to :c:macro:`!EDOM`.
113+
114+
.. versionadded:: 3.14
115+
116+
117+
.. c:function:: Py_complex _Py_rc_quot(double dividend, Py_complex divisor)
118+
119+
Return the quotient of a real number and a complex number, using the C
120+
:c:type:`Py_complex` representation.
121+
122+
If *divisor* is zero, this method returns zero and sets
123+
:c:data:`errno` to :c:macro:`!EDOM`.
124+
125+
.. versionadded:: 3.14
126+
127+
74128
.. c:function:: Py_complex _Py_c_pow(Py_complex num, Py_complex exp)
75129
76130
Return the exponentiation of *num* by *exp*, using the C :c:type:`Py_complex`

‎Doc/c-api/init_config.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,9 +1590,22 @@ If a ``._pth`` file is present:
15901590
* Set :c:member:`~PyConfig.site_import` to ``0``.
15911591
* Set :c:member:`~PyConfig.safe_path` to ``1``.
15921592
1593+
If :c:member:`~PyConfig.home` is not set and a ``pyvenv.cfg`` file is present in
1594+
the same directory as :c:member:`~PyConfig.executable`, or its parent,
1595+
:c:member:`~PyConfig.prefix` and :c:member:`~PyConfig.exec_prefix` are set that
1596+
location. When this happens, :c:member:`~PyConfig.base_prefix` and
1597+
:c:member:`~PyConfig.base_exec_prefix` still keep their value, pointing to the
1598+
base installation. See :ref:`sys-path-init-virtual-environments` for more
1599+
information.
1600+
15931601
The ``__PYVENV_LAUNCHER__`` environment variable is used to set
15941602
:c:member:`PyConfig.base_executable`.
15951603
1604+
.. versionchanged:: 3.14
1605+
1606+
:c:member:`~PyConfig.prefix`, and :c:member:`~PyConfig.exec_prefix`, are now
1607+
set to the ``pyvenv.cfg`` directory. This was previously done by :mod:`site`,
1608+
therefore affected by :option:`-S`.
15961609
15971610
.. _pyinitconfig_api:
15981611

‎Doc/c-api/object.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Object Protocol
8585
instead of the :func:`repr`.
8686
8787
88-
.. c:function:: int PyObject_HasAttrWithError(PyObject *o, const char *attr_name)
88+
.. c:function:: int PyObject_HasAttrWithError(PyObject *o, PyObject *attr_name)
8989
9090
Returns ``1`` if *o* has the attribute *attr_name*, and ``0`` otherwise.
9191
This is equivalent to the Python expression ``hasattr(o, attr_name)``.

0 commit comments

Comments
 (0)
0