Merge branch 'main' into rpow

Author: serhiy-storchaka

.github/workflows/build.yml

@@ -245,13 +245,13 @@ jobs:
         - true
         os:
         - ubuntu-24.04
-        - ubuntu-22.04-arm
+        - ubuntu-24.04-arm
         exclude:
         # Do not test BOLT with free-threading, to conserve resources
         - bolt: true
           free-threading: true
         # BOLT currently crashes during instrumentation on aarch64
-        - os: ubuntu-22.04-arm
+        - os: ubuntu-24.04-arm
           bolt: true
     uses: ./.github/workflows/reusable-ubuntu.yml
     with:

.github/workflows/jit.yml

@@ -86,7 +86,7 @@ jobs:
             runner: ubuntu-24.04
           - target: aarch64-unknown-linux-gnu/gcc
             architecture: aarch64
-            runner: ubuntu-22.04-arm
+            runner: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/tail-call.yml

@@ -65,7 +65,7 @@ jobs:
             runner: ubuntu-24.04
           - target: aarch64-unknown-linux-gnu/gcc
             architecture: aarch64
-            runner: ubuntu-22.04-arm
+            runner: ubuntu-24.04-arm
           - target: free-threading
             architecture: x86_64
             runner: ubuntu-24.04

Doc/c-api/arg.rst

@@ -645,6 +645,10 @@ Building values
    ``n`` (:class:`int`) [:c:type:`Py_ssize_t`]
       Convert a C :c:type:`Py_ssize_t` to a Python integer.
 
+   ``p`` (:class:`bool`) [int]
+      Convert a C :c:expr:`int` to a Python :class:`bool` object.
+      .. versionadded:: 3.14
+
    ``c`` (:class:`bytes` of length 1) [char]
       Convert a C :c:expr:`int` representing a byte to a Python :class:`bytes` object of
       length 1.

Doc/c-api/exceptions.rst

@@ -921,11 +921,7 @@ because the :ref:`call protocol <call>` takes care of recursion handling.
 
    Marks a point where a recursive C-level call is about to be performed.
 
-   If :c:macro:`!USE_STACKCHECK` is defined, this function checks if the OS
-   stack overflowed using :c:func:`PyOS_CheckStack`.  If this is the case, it
-   sets a :exc:`MemoryError` and returns a nonzero value.
-
-   The function then checks if the recursion limit is reached.  If this is the
+   The function then checks if the stack limit is reached.  If this is the
    case, a :exc:`RecursionError` is set and a nonzero value is returned.
    Otherwise, zero is returned.
 

Doc/library/dataclasses.rst

@@ -270,10 +270,11 @@ Module contents
      string returned by the generated :meth:`~object.__repr__` method.
 
    - *hash*: This can be a bool or ``None``.  If true, this field is
-     included in the generated :meth:`~object.__hash__` method.  If ``None`` (the
-     default), use the value of *compare*: this would normally be
-     the expected behavior.  A field should be considered in the hash
-     if it's used for comparisons.  Setting this value to anything
+     included in the generated :meth:`~object.__hash__` method.  If false,
+     this field is excluded from the generated :meth:`~object.__hash__`.
+     If ``None`` (the default), use the value of *compare*: this would
+     normally be the expected behavior, since a field should be included
+     in the hash if it's used for comparisons.  Setting this value to anything
      other than ``None`` is discouraged.
 
      One possible reason to set ``hash=False`` but ``compare=True``

Doc/library/dis.rst

@@ -97,23 +97,23 @@ The following options are accepted:
 
 .. program:: dis
 
-.. cmdoption:: -h, --help
+.. option:: -h, --help
 
    Display usage and exit.
 
-.. cmdoption:: -C, --show-caches
+.. option:: -C, --show-caches
 
    Show inline caches.
 
-.. cmdoption:: -O, --show-offsets
+.. option:: -O, --show-offsets
 
    Show offsets of instructions.
 
-.. cmdoption:: -P, --show-positions
+.. option:: -P, --show-positions
 
    Show positions of instructions in the source code.
 
-.. cmdoption:: -S, --specialized
+.. option:: -S, --specialized
 
    Show specialized bytecode.
 

Doc/library/ensurepip.rst

@@ -43,6 +43,8 @@ when creating a virtual environment) or after explicitly uninstalling
 Command line interface
 ----------------------
 
+.. program:: ensurepip
+
 The command line interface is invoked using the interpreter's ``-m`` switch.
 
 The simplest possible invocation is::
@@ -61,26 +63,34 @@ By default, ``pip`` is installed into the current virtual environment
 active virtual environment). The installation location can be controlled
 through two additional command line options:
 
-* :samp:`--root {dir}`: Installs ``pip`` relative to the given root directory
-  rather than the root of the currently active virtual environment (if any)
-  or the default root for the current Python installation.
-* ``--user``: Installs ``pip`` into the user site packages directory rather
-  than globally for the current Python installation (this option is not
-  permitted inside an active virtual environment).
+.. option:: --root <dir>
+
+   Installs ``pip`` relative to the given root directory rather than the root
+   of the currently active virtual environment (if any) or the default root
+   for the current Python installation.
+
+.. option:: --user
+
+   Installs ``pip`` into the user site packages directory rather than globally
+   for the current Python installation (this option is not permitted inside an
+   active virtual environment).
 
 By default, the scripts ``pipX`` and ``pipX.Y`` will be installed (where
 X.Y stands for the version of Python used to invoke ``ensurepip``). The
 scripts installed can be controlled through two additional command line
 options:
 
-* ``--altinstall``: if an alternate installation is requested, the ``pipX``
-  script will *not* be installed.
+.. option:: --altinstall
 
-* ``--default-pip``: if a "default pip" installation is requested, the
-  ``pip`` script will be installed in addition to the two regular scripts.
+   If an alternate installation is requested, the ``pipX`` script will *not* be
+   installed.
 
-Providing both of the script selection options will trigger an exception.
+.. option:: --default-pip
+
+   If a "default pip" installation is requested, the ``pip`` script will be
+   installed in addition to the two regular scripts.
 
+Providing both of the script selection options will trigger an exception.
 
 Module API
 ----------
@@ -136,3 +146,4 @@ Module API
       ``pip``, but other software should not assume those dependencies will
       always be present by default (as the dependencies may be removed in a
       future version of ``pip``).
+

Doc/library/traceback.rst

@@ -115,14 +115,14 @@ Module-Level Functions
 
 .. function:: print_exc(limit=None, file=None, chain=True)
 
-   This is a shorthand for ``print_exception(sys.exception(), limit, file,
-   chain)``.
+   This is a shorthand for ``print_exception(sys.exception(), limit=limit, file=file,
+   chain=chain)``.
 
 
 .. function:: print_last(limit=None, file=None, chain=True)
 
-   This is a shorthand for ``print_exception(sys.last_exc, limit, file,
-   chain)``.  In general it will work only after an exception has reached
+   This is a shorthand for ``print_exception(sys.last_exc, limit=limit, file=file,
+   chain=chain)``.  In general it will work only after an exception has reached
    an interactive prompt (see :data:`sys.last_exc`).
 
 

Doc/requirements.txt

@@ -7,7 +7,7 @@
 # won't suddenly cause build failures. Updating the version is fine as long
 # as no warnings are raised by doing so.
 # Keep this version in sync with ``Doc/conf.py``.
-sphinx~=8.1.0
+sphinx~=8.2.0
 
 blurb