diff --git a/changelog.d/20260616_140000_abdul.muqadim_bump_setuptools_main.md b/changelog.d/20260616_140000_abdul.muqadim_bump_setuptools_main.md new file mode 100644 index 0000000000..2269cd272d --- /dev/null +++ b/changelog.d/20260616_140000_abdul.muqadim_bump_setuptools_main.md @@ -0,0 +1 @@ +- [Bugfix] On the main branch, bump the pinned build-time `setuptools` to 80.9.0 (the release branch keeps 69.1.1). The older version cannot build packages that declare their license with the PEP 639 `project.license` field (e.g. `mysqlclient`) against the Open edX master branch, which broke `tutor images build openedx` on main. (by @Abdul-Muqadim-Arbisoft) diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 743776c44a..7a71965233 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -20,7 +20,7 @@ ARG PIP_COMMAND="uv pip" # setuptools 81 removed pkg_resources. Inherited by all stages, and reused as # the single source of truth for the venv setuptools pin below. # https://github.com/overhangio/tutor/issues/1350 -RUN echo "setuptools==69.1.1" > /etc/openedx-build-constraints.txt +RUN echo "setuptools==80.9.0" > /etc/openedx-build-constraints.txt ENV UV_BUILD_CONSTRAINT=/etc/openedx-build-constraints.txt ENV PIP_CONSTRAINT=/etc/openedx-build-constraints.txt