Skip to content

Commit fc87462

Browse files
authored
Merge branch '3.13' into backport-c39ae89-3.13
2 parents 49eb82d + fcb2656 commit fc87462

File tree

8 files changed

+13
-6
lines changed

8 files changed

+13
-6
lines changed

Doc/using/configure.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@ General Options
314314

315315
By convention, ``--enable-experimental-jit`` is a shorthand for ``--enable-experimental-jit=yes``.
316316

317+
.. note::
318+
319+
When building CPython with JIT enabled, ensure that your system has Python 3.11 or later installed.
320+
317321
.. versionadded:: 3.13
318322

319323
.. option:: PKG_CONFIG

Lib/asyncio/locks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ class Barrier(mixins._LoopBoundMixin):
485485
def __init__(self, parties):
486486
"""Create a barrier, initialised to 'parties' tasks."""
487487
if parties < 1:
488-
raise ValueError('parties must be > 0')
488+
raise ValueError('parties must be >= 1')
489489

490490
self._cond = Condition() # notify all tasks when state changes
491491

Lib/multiprocessing/connection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ def PipeClient(address):
846846
_LEGACY_LENGTHS = (_MD5ONLY_MESSAGE_LENGTH, _MD5_DIGEST_LEN)
847847

848848

849-
def _get_digest_name_and_payload(message: bytes) -> (str, bytes):
849+
def _get_digest_name_and_payload(message): # type: (bytes) -> tuple[str, bytes]
850850
"""Returns a digest name and the payload for a response hash.
851851
852852
If a legacy protocol is detected based on the message length

Lib/multiprocessing/synchronize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ def wait(self, timeout=None):
360360
return True
361361
return False
362362

363-
def __repr__(self) -> str:
363+
def __repr__(self):
364364
set_status = 'set' if self.is_set() else 'unset'
365365
return f"<{type(self).__qualname__} at {id(self):#x} {set_status}>"
366366
#

Lib/test/test_uuid.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def importable(name):
1919
try:
2020
__import__(name)
2121
return True
22-
except:
22+
except ModuleNotFoundError:
2323
return False
2424

2525

Lib/threading.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ def __init__(self, parties, action=None, timeout=None):
690690
691691
"""
692692
if parties < 1:
693-
raise ValueError("parties must be > 0")
693+
raise ValueError("parties must be >= 1")
694694
self._cond = Condition(Lock())
695695
self._action = action
696696
self._timeout = timeout
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Corrected :exc:`ValueError` message for :class:`asyncio.Barrier` and :class:`threading.Barrier`.

Tools/jit/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ The JIT Compiler
33

44
This version of CPython can be built with an experimental just-in-time compiler[^pep-744]. While most everything you already know about building and using CPython is unchanged, you will probably need to install a compatible version of LLVM first.
55

6+
Python 3.11 or newer is required to build the JIT.
7+
68
## Installing LLVM
79

810
The JIT compiler does not require end users to install any third-party dependencies, but part of it must be *built* using LLVM[^why-llvm]. You are *not* required to build the rest of CPython using LLVM, or even the same version of LLVM (in fact, this is uncommon).
@@ -57,7 +59,7 @@ For `PCbuild`-based builds, pass the new `--experimental-jit` option to `build.b
5759

5860
For all other builds, pass the new `--enable-experimental-jit` option to `configure`.
5961

60-
Otherwise, just configure and build as you normally would. Cross-compiling "just works", since the JIT is built for the host platform.
62+
Otherwise, just configure and build as you normally would. Cross-compiling "just works", since the JIT is built for the host platform.
6163

6264
The JIT can also be enabled or disabled using the `PYTHON_JIT` environment variable, even on builds where it is enabled or disabled by default. More details about configuring CPython with the JIT and optional values for `--enable-experimental-jit` can be found [here](https://docs.python.org/dev/whatsnew/3.13.html#experimental-jit-compiler).
6365

0 commit comments

Comments
 (0)