Skip to content

Commit 53dd6ae

Browse files
authored
Merge branch 'main' into opt-mod-loadattr-103951
2 parents d052f9d + a1c57bc commit 53dd6ae

Some content is hidden

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

44 files changed

+259
-125
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: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- x86_64-pc-windows-msvc/msvc
5353
- aarch64-pc-windows-msvc/msvc
5454
- x86_64-apple-darwin/clang
55-
- aarch64-apple-darwin/clang
55+
# - aarch64-apple-darwin/clang
5656
- x86_64-unknown-linux-gnu/gcc
5757
- x86_64-unknown-linux-gnu/clang
5858
- aarch64-unknown-linux-gnu/gcc
@@ -79,10 +79,11 @@ jobs:
7979
architecture: x86_64
8080
runner: macos-13
8181
compiler: clang
82-
- target: aarch64-apple-darwin/clang
83-
architecture: aarch64
84-
runner: macos-14
85-
compiler: clang
82+
# GH-126464: A recent change to either GHA or LLVM broke this job:
83+
# - target: aarch64-apple-darwin/clang
84+
# architecture: aarch64
85+
# runner: macos-14
86+
# compiler: clang
8687
- target: x86_64-unknown-linux-gnu/gcc
8788
architecture: x86_64
8889
runner: ubuntu-22.04

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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

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/library/dis.rst

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,13 @@ iterations of the loop.
13951395
This opcode is now only used in situations where the local variable is
13961396
guaranteed to be initialized. It cannot raise :exc:`UnboundLocalError`.
13971397

1398+
.. opcode:: LOAD_FAST_LOAD_FAST (var_nums)
1399+
1400+
Pushes references to ``co_varnames[var_nums >> 4]`` and
1401+
``co_varnames[var_nums & 15]`` onto the stack.
1402+
1403+
.. versionadded:: 3.13
1404+
13981405
.. opcode:: LOAD_FAST_CHECK (var_num)
13991406

14001407
Pushes a reference to the local ``co_varnames[var_num]`` onto the stack,
@@ -1415,6 +1422,20 @@ iterations of the loop.
14151422

14161423
Stores ``STACK.pop()`` into the local ``co_varnames[var_num]``.
14171424

1425+
.. opcode:: STORE_FAST_STORE_FAST (var_nums)
1426+
1427+
Stores ``STACK[-1]`` into ``co_varnames[var_nums >> 4]``
1428+
and ``STACK[-2]`` into ``co_varnames[var_nums & 15]``.
1429+
1430+
.. versionadded:: 3.13
1431+
1432+
.. opcode:: STORE_FAST_LOAD_FAST (var_nums)
1433+
1434+
Stores ``STACK.pop()`` into the local ``co_varnames[var_nums >> 4]``
1435+
and pushes a reference to the local ``co_varnames[var_nums & 15]``
1436+
onto the stack.
1437+
1438+
.. versionadded:: 3.13
14181439

14191440
.. opcode:: DELETE_FAST (var_num)
14201441

Doc/library/pathlib.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,6 +1592,11 @@ Copying, moving and deleting
15921592
This argument has no effect when copying files on Windows (where
15931593
metadata is always preserved).
15941594

1595+
.. note::
1596+
Where supported by the operating system and file system, this method
1597+
performs a lightweight copy, where data blocks are only copied when
1598+
modified. This is known as copy-on-write.
1599+
15951600
.. versionadded:: 3.14
15961601

15971602

0 commit comments

Comments
 (0)