Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade CPython 3.12.8 to 3.12.9, 3.13.1 to 3.13.2 #513

Merged
merged 1 commit into from
Feb 5, 2025

Conversation

geofft
Copy link
Collaborator

@geofft geofft commented Feb 5, 2025

Our BOLT patches that landed for 3.14 have been backported to 3.12 and 3.13, so the remaining BOLT patch now applies to 3.12+.

"url": "https://www.python.org/ftp/python/3.12.9/Python-3.12.9.tar.xz",
"size": 20502440,
"sha256": "7220835d9f90b37c006e9842a8dff4580aaca4318674f947302b8d28f3f81112",
"version": "3.12.9",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp312",
},
"cpython-3.13": {
"url": "https://www.python.org/ftp/python/3.13.1/Python-3.13.1.tar.xz",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing bump here, causing integrity errors

@zanieb
Copy link
Member

zanieb commented Feb 5, 2025

The other failure is

cpython-3.12> Hunk #1 succeeded at 1622 (offset 293 lines).
cpython-3.12> + '[' -n 1 ']'
cpython-3.12> + patch -p1 -i /build/patch-test-embed-prevent-segfault.patch
cpython-3.12> patching file Lib/test/test_embed.py
cpython-3.12> Hunk #2 FAILED at 1867.
cpython-3.12> 1 out of 2 hunks FAILED
cpython-3.12> -- saving rejects to file Lib/test/test_embed.py.rej
Traceback (most recent call last):
  File "/home/runner/work/python-build-standalone/python-build-standalone/cpython-unix/build.py", line 1253, in <module>
    sys.exit(main())
             ^^^^^^
  File "/home/runner/work/python-build-standalone/python-build-standalone/cpython-unix/build.py", line 1235, in main
    build_cpython(
  File "/home/runner/work/python-build-standalone/python-build-standalone/cpython-unix/build.py", line 831, in build_cpython
    build_env.run("build-cpython.sh", environment=env)
  File "/home/runner/work/python-build-standalone/python-build-standalone/pythonbuild/buildenv.py", line 95, in run
    container_exec(self.container, program, user=user, environment=environment)
  File "/home/runner/work/python-build-standalone/python-build-standalone/pythonbuild/docker.py", line 143, in container_exec
    raise Exception("exit code %d from %s" % (inspect_res["ExitCode"], command))
Exception: exit code 1 from /build/build-cpython.sh

I believe this was upstreamed as well in python/cpython#128474 though I don't see a backport?

@geofft
Copy link
Collaborator Author

geofft commented Feb 5, 2025

I think 128474 is patch-test-embed-prevent-segfault-3.14.patch. This is the second hunk of patch-test-embed-prevent-segfault.patch, which is a test that was reworked in python/cpython@48f08fe. I'm going to try deleting the hunk, we'll see if the reworked test segfaults....

Our BOLT patches that landed for 3.14 have been backported to 3.12 and
3.13, so the remaining BOLT patch now applies to 3.12+.
@geofft geofft force-pushed the cpython-feb-4-patch-releases branch from 20e415b to 5141e4f Compare February 5, 2025 17:14
@geofft geofft merged commit 183bc64 into astral-sh:main Feb 5, 2025
134 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants