diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a6068f8a..ac8b53a59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## [Unreleased] +- Stopped using `--with-system-expat` when compiling new Python versions. ([#1925](https://github.com/heroku/heroku-buildpack-python/pull/1925)) ## [v312] - 2025-10-05 diff --git a/builds/Dockerfile b/builds/Dockerfile index 8e83a738a..e9f0703fc 100644 --- a/builds/Dockerfile +++ b/builds/Dockerfile @@ -17,4 +17,4 @@ RUN apt-get update --error-on=any \ COPY --from=cosign /ko-app/cosign /usr/local/bin/cosign WORKDIR /tmp -COPY build_python_runtime.sh python-3.13-ubuntu-22.04-libexpat-workaround.patch . +COPY build_python_runtime.sh . diff --git a/builds/build_python_runtime.sh b/builds/build_python_runtime.sh index 18a8dc5ea..f78e72b35 100755 --- a/builds/build_python_runtime.sh +++ b/builds/build_python_runtime.sh @@ -83,14 +83,6 @@ cosign verify-blob \ tar --extract --file python.tgz --strip-components=1 --directory "${SRC_DIR}" cd "${SRC_DIR}" -# Work around PGO profile test failures with Python 3.13 on Ubuntu 22.04, due to the tests -# checking the raw libexpat version which doesn't account for Ubuntu backports: -# https://github.com/heroku/heroku-buildpack-python/pull/1661#issuecomment-2405259352 -# https://github.com/python/cpython/issues/125067 -if [[ "${PYTHON_MAJOR_VERSION}" == "3.13" && "${STACK}" == "heroku-22" ]]; then - patch -p1