From 1bbff0bb9b23eeafcd8b88b9ae1162b2457f2d84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Gonz=C3=A1lez?= Date: Tue, 27 Jan 2026 21:43:31 -0400 Subject: [PATCH] fix: set utf8mb4 charset on django conection options Since several releases ago Tutor uses utf8mb4 as the default conection charset but does not properly configure it for instances running external MySQL. This also includes some unrelated changes to the changelog management. --- CHANGELOG.md | 9 +++++++++ changelog.d/scriv/entry_title.md.j2 | 1 + changelog.d/scriv/new_fragment.md.j2 | 15 +++++++++++++++ drydock/patches/openedx-common-settings | 2 ++ pyproject.toml | 2 +- uv.lock | 2 +- 6 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 changelog.d/scriv/entry_title.md.j2 create mode 100644 changelog.d/scriv/new_fragment.md.j2 diff --git a/CHANGELOG.md b/CHANGELOG.md index a4ac7bc..33654ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,15 @@ See the fragment files in the [changelog.d/ directory](./changelog.d). + +## 20.2.0 — 2026-01-27 + +### Fixed + +- Ensure that the `utf8mb4` charset is used when connecting to MySQL. +- Do not proxy SCORM assets directly through the LMS. This restores the previous + behaviour for versions prior to v19.0.3 of openedx-scorm-xblock. + ## 20.1.1 — 2025-12-04 diff --git a/changelog.d/scriv/entry_title.md.j2 b/changelog.d/scriv/entry_title.md.j2 new file mode 100644 index 0000000..9abfd83 --- /dev/null +++ b/changelog.d/scriv/entry_title.md.j2 @@ -0,0 +1 @@ +{% if version %}{{ version }} — {% endif %}{{ date.strftime('%Y-%m-%d') }} diff --git a/changelog.d/scriv/new_fragment.md.j2 b/changelog.d/scriv/new_fragment.md.j2 new file mode 100644 index 0000000..c6ef1ff --- /dev/null +++ b/changelog.d/scriv/new_fragment.md.j2 @@ -0,0 +1,15 @@ + + +{% for cat in config.categories -%} + +{% endfor -%} diff --git a/drydock/patches/openedx-common-settings b/drydock/patches/openedx-common-settings index 20429b5..80cf55a 100644 --- a/drydock/patches/openedx-common-settings +++ b/drydock/patches/openedx-common-settings @@ -30,3 +30,5 @@ LOGGING["loggers"].pop("tracking") LOGGING["loggers"][""]["handlers"] = ["console"] FORUM_MONGODB_DATABASE = "{{ FORUM_MONGODB_DATABASE }}" + +DATABASES["default"]["OPTIONS"]["charset"] = "utf8mb4" diff --git a/pyproject.toml b/pyproject.toml index 568a184..c6697cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "tutor-contrib-drydock" -version = "20.1.1" +version = "20.2.0" description = "A Tutor plugin to manage our opinionated Open edX operations" readme = "README.md" requires-python = ">=3.10" diff --git a/uv.lock b/uv.lock index 5d5456f..5d642b5 100644 --- a/uv.lock +++ b/uv.lock @@ -801,7 +801,7 @@ sdist = { url = "https://files.pythonhosted.org/packages/f9/8f/423a562a1873b376a [[package]] name = "tutor-contrib-drydock" -version = "20.1.1" +version = "20.2.0" source = { editable = "." } dependencies = [ { name = "tutor" },