From 26d25a8c0a39a72e264e6ff3bce1de0a502dd7e8 Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Tue, 10 Feb 2026 10:26:10 -0500 Subject: [PATCH 1/3] fix: Cherry-pick commits to fix three critical issues ulmo.1 --- changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md | 3 +++ tutor/templates/build/openedx/Dockerfile | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md diff --git a/changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md b/changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md new file mode 100644 index 0000000000..81d8f93099 --- /dev/null +++ b/changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md @@ -0,0 +1,3 @@ +- [Bugfix] Upgrade edx-search to 4.4.0 to fix Catalog MFE (by @kdmccormick) +- [Security] Upgrade Django from 5.2.7 to 5.2.11 (by @kdmccormick) +- [Bugfix] Upgrade ora2 to address pkg\_resources build failure (by @kdmccormick) diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index b99473af5e..ac08490148 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -58,9 +58,18 @@ RUN git config --global user.email "tutor@overhang.io" \ # Patches in Main node {%- else %} # Patches in non-Main mode (i.e., Release mode) +## Update edx-search to 4.4.0 to fix the Catalog MFE +RUN curl -fsSL https://github.com/openedx/openedx-platform/commit/1db37f309f710fa54e2372b1a3ca6dbb9b05640f.patch | git am +## Bump Django 5.2.7->5.2.11 for security fix +RUN curl -fsSL https://github.com/openedx/openedx-platform/commit/5f95ef0ba14baf145652d93be33176c51f926c6e.patch | git am +## Upgrade edx-ora2 to fix pkg_resources build error +RUN curl -fsSL https://github.com/openedx/openedx-platform/commit/e05ed0afb1a291635a91efc8c1620d06858f65c6.patch | git am {%- endif %} -{# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/.patch | git am #} +{# Add new patches like this: #} +{# RUN curl -fsSL https://github.com/openedx/edx-platform/commit/.patch | git am #} +{# Include a comment on why the patch is neccessary. #} + {{ patch("openedx-dockerfile-post-git-checkout") }} ##### Empty layer with just the repo at the root. From 1acbb84ad2e0dda71b999478af7399177615b9f9 Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Wed, 11 Feb 2026 10:00:59 -0500 Subject: [PATCH 2/3] docs: Remove changelog entry which only affects tutor devs The audience of the Changelog is tutor users, not tutor developers. We shouldn't add Changelog entries for things which don't affects users. --- changelog.d/20260120_155642_ahmed.khalid_fix_release_workflow.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 changelog.d/20260120_155642_ahmed.khalid_fix_release_workflow.md diff --git a/changelog.d/20260120_155642_ahmed.khalid_fix_release_workflow.md b/changelog.d/20260120_155642_ahmed.khalid_fix_release_workflow.md deleted file mode 100644 index 1515c81f15..0000000000 --- a/changelog.d/20260120_155642_ahmed.khalid_fix_release_workflow.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Fix release workflow by replacing deprecated macos-13 with macos-14. (by @ahmed-arb) From 2cf633e5ca932913c553c4f3d210dd79e2bf26b4 Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Wed, 11 Feb 2026 10:00:16 -0500 Subject: [PATCH 3/3] build: Release v20.0.1 --- CHANGELOG.md | 9 +++++++++ .../20260127_104718_kdmccormick_openedx_platform.md | 1 - changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md | 3 --- tutor/__about__.py | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 changelog.d/20260127_104718_kdmccormick_openedx_platform.md delete mode 100644 changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c0b7dfa98..490cd467c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,15 @@ instructions, because git commits are used to generate release notes: + +## v21.0.1 (2026-02-11) + +- [Feature] Add support for mounting `openedx-platform`, the which is new name of `edx-platform`. Mounting by the old name, `edx-platform`, will continue to work for now as well (by @kdmccormick). + +- [Bugfix] Upgrade edx-search to 4.4.0 to fix Catalog MFE (by @kdmccormick) +- [Security] Upgrade Django from 5.2.7 to 5.2.11 (by @kdmccormick) +- [Bugfix] Upgrade ora2 to address pkg\_resources build failure (by @kdmccormick) + ## v21.0.0 (2026-01-07) diff --git a/changelog.d/20260127_104718_kdmccormick_openedx_platform.md b/changelog.d/20260127_104718_kdmccormick_openedx_platform.md deleted file mode 100644 index 54b2b0b234..0000000000 --- a/changelog.d/20260127_104718_kdmccormick_openedx_platform.md +++ /dev/null @@ -1 +0,0 @@ -- [Feature] Add support for mounting `openedx-platform`, the which is new name of `edx-platform`. Mounting by the old name, `edx-platform`, will continue to work for now as well (by @kdmccormick). diff --git a/changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md b/changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md deleted file mode 100644 index 81d8f93099..0000000000 --- a/changelog.d/20260210_102309_kdmccormick_fix_ulmo_1.md +++ /dev/null @@ -1,3 +0,0 @@ -- [Bugfix] Upgrade edx-search to 4.4.0 to fix Catalog MFE (by @kdmccormick) -- [Security] Upgrade Django from 5.2.7 to 5.2.11 (by @kdmccormick) -- [Bugfix] Upgrade ora2 to address pkg\_resources build failure (by @kdmccormick) diff --git a/tutor/__about__.py b/tutor/__about__.py index aa0aa8ee4d..bef7ab56cc 100644 --- a/tutor/__about__.py +++ b/tutor/__about__.py @@ -2,7 +2,7 @@ # Increment this version number to trigger a new release. See # docs/tutor.html#versioning for information on the versioning scheme. -__version__ = "21.0.0" +__version__ = "21.0.1" # The version suffix will be appended to the actual version, separated by a # dash. Use this suffix to differentiate between the actual released version and