Skip to content

Commit dea00ba

Browse files
serhiy-storchakaserhiy-storchaka
committed
Merge branch 'main' into tk87tests
2 parents 19232e7 + d50a7c4 commit dea00ba

28 files changed

+166
-155
lines changed

‎.github/CODEOWNERS

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ Python/bytecodes.c @markshannon
4040
Python/optimizer*.c @markshannon
4141
Python/optimizer_analysis.c @Fidget-Spinner
4242
Python/optimizer_bytecodes.c @Fidget-Spinner
43+
Python/symtable.c @JelleZijlstra @carljm
4344
Lib/_pyrepl/* @pablogsal @lysnikolaou @ambv
4445
Lib/test/test_patma.py @brandtbucher
4546
Lib/test/test_type_*.py @JelleZijlstra
@@ -153,10 +154,10 @@ Include/internal/pycore_time.h @pganssle @abalkin
153154
/Tools/cases_generator/ @markshannon
154155

155156
# AST
156-
Python/ast.c @isidentical
157-
Parser/asdl.py @isidentical
158-
Parser/asdl_c.py @isidentical
159-
Lib/ast.py @isidentical
157+
Python/ast.c @isidentical @JelleZijlstra
158+
Parser/asdl.py @isidentical @JelleZijlstra
159+
Parser/asdl_c.py @isidentical @JelleZijlstra
160+
Lib/ast.py @isidentical @JelleZijlstra
160161

161162
# Mock
162163
/Lib/unittest/mock.py @cjw296

‎.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,9 @@ jobs:
199199
uses: ./.github/workflows/reusable-macos.yml
200200
with:
201201
config_hash: ${{ needs.check_source.outputs.config_hash }}
202-
# Cirrus is M1, macos-13 is default GHA Intel
203-
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-13"]'
202+
# Cirrus and macos-14 are M1, macos-13 is default GHA Intel.
203+
# Cirrus used for upstream, macos-14 for forks.
204+
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14", "macos-13"]'
204205

205206
build_macos_free_threading:
206207
name: 'macOS (free-threading)'
@@ -210,8 +211,9 @@ jobs:
210211
with:
211212
config_hash: ${{ needs.check_source.outputs.config_hash }}
212213
free-threading: true
213-
# Cirrus is M1
214-
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma"]'
214+
# Cirrus and macos-14 are M1.
215+
# Cirrus used for upstream, macos-14 for forks.
216+
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-14"]'
215217

216218
build_ubuntu:
217219
name: 'Ubuntu'

‎.github/workflows/reusable-macos.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
build_macos:
17-
name: 'build and test'
17+
name: build and test (${{ matrix.os }})
1818
timeout-minutes: 60
1919
env:
2020
HOMEBREW_NO_ANALYTICS: 1
@@ -27,6 +27,13 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
os: ${{fromJson(inputs.os-matrix)}}
30+
is-fork:
31+
- ${{ github.repository_owner != 'python' }}
32+
exclude:
33+
- os: "ghcr.io/cirruslabs/macos-runner:sonoma"
34+
is-fork: true
35+
- os: "macos-14"
36+
is-fork: false
3037
runs-on: ${{ matrix.os }}
3138
steps:
3239
- uses: actions/checkout@v4

‎Doc/library/contextlib.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,9 @@ Functions and classes provided:
314314

315315
If the code within the :keyword:`!with` block raises a
316316
:exc:`BaseExceptionGroup`, suppressed exceptions are removed from the
317-
group. If any exceptions in the group are not suppressed, a group containing them is re-raised.
317+
group. Any exceptions of the group which are not suppressed are re-raised in
318+
a new group which is created using the original group's :meth:`~BaseExceptionGroup.derive`
319+
method.
318320

319321
.. versionadded:: 3.4
320322

‎Doc/library/dis.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,9 +336,10 @@ operation is being performed, so the intermediate analysis object isn't useful:
336336
Added the *show_caches* and *adaptive* parameters.
337337

338338
.. versionchanged:: 3.13
339-
The *show_caches* parameter is deprecated and has no effect. The *cache_info*
340-
field of each instruction is populated regardless of its value.
341-
339+
The *show_caches* parameter is deprecated and has no effect. The iterator
340+
generates the :class:`Instruction` instances with the *cache_info*
341+
field populated (regardless of the value of *show_caches*) and it no longer
342+
generates separate items for the cache entries.
342343

343344
.. function:: findlinestarts(code)
344345

‎Doc/library/exceptions.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,8 @@ their subgroups based on the types of the contained exceptions.
989989
Returns an exception group with the same :attr:`message`, but which
990990
wraps the exceptions in ``excs``.
991991

992-
This method is used by :meth:`subgroup` and :meth:`split`. A
992+
This method is used by :meth:`subgroup` and :meth:`split`, which
993+
are used in various contexts to break up an exception group. A
993994
subclass needs to override it in order to make :meth:`subgroup`
994995
and :meth:`split` return instances of the subclass rather
995996
than :exc:`ExceptionGroup`.

‎Doc/library/ipaddress.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ The module also provides the following module level functions:
990990
.. function:: collapse_addresses(addresses)
991991

992992
Return an iterator of the collapsed :class:`IPv4Network` or
993-
:class:`IPv6Network` objects. *addresses* is an iterator of
993+
:class:`IPv6Network` objects. *addresses* is an :term:`iterable` of
994994
:class:`IPv4Network` or :class:`IPv6Network` objects. A :exc:`TypeError` is
995995
raised if *addresses* contains mixed version objects.
996996

‎Doc/library/time.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ Functions
617617
- range [1, 12]
618618

619619
* - 2
620-
- .. attribute:: tm_day
620+
- .. attribute:: tm_mday
621621
- range [1, 31]
622622

623623
* - 3

‎Doc/whatsnew/3.13.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,13 @@ dis
706706
the ``show_offsets`` parameter.
707707
(Contributed by Irit Katriel in :gh:`112137`.)
708708

709+
* :meth:`~dis.get_instructions` no longer represents cache entries as
710+
separate instructions. Instead, it returns them as part of the
711+
:class:`~dis.Instruction`, in the new *cache_info* field. The
712+
*show_caches* argument to :meth:`~dis.get_instructions` is
713+
deprecated and no longer has any effect.
714+
(Contributed by Irit Katriel in :gh:`112962`.)
715+
709716
.. _whatsnew313-doctest:
710717

711718
doctest

‎InternalDocs/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ it is not, please report that through the
1414

1515
[Exception Handling](exception_handling.md)
1616

17+
[Adaptive Instruction Families](adaptive.md)

0 commit comments

Comments
 (0)