Skip to content

Commit e29508a

Browse files
Merge branch 'main' of https://github.com/python/cpython into jit
2 parents f86252d + 8de70b3 commit e29508a

File tree

20 files changed

+1438
-1310
lines changed

20 files changed

+1438
-1310
lines changed

Android/android.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,8 @@ async def gradle_task(context):
628628
# Randomization is disabled because order-dependent failures are
629629
# much less likely to pass on a rerun in single-process mode.
630630
"-m", "test",
631-
f"--{context.ci_mode}-ci", "--single-process", "--no-randomize"
631+
f"--{context.ci_mode}-ci", "--single-process", "--no-randomize",
632+
"--pythoninfo",
632633
]
633634

634635
if not any(arg in context.args for arg in ["-c", "-m"]):

Apple/__main__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,7 @@ def test(context: argparse.Namespace, host: str | None = None) -> None: # noqa:
831831
f"--{context.ci_mode}-ci",
832832
"--single-process",
833833
"--no-randomize",
834+
"--pythoninfo",
834835
# Timeout handling requires subprocesses; explicitly setting
835836
# the timeout to -1 disables the faulthandler.
836837
"--timeout=-1",

Include/internal/pycore_opcode_metadata.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)