From 2233c3422a203cbd76924aab1fb5232cfcd3f70f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Mon, 22 May 2023 18:11:06 +0200 Subject: [PATCH 1/2] feat: upgrade to open-release/olive.4 --- changelog.d/20230522_181022_regis_olive_4.md | 1 + docs/configuration.rst | 2 +- tutor/templates/config/defaults.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/20230522_181022_regis_olive_4.md diff --git a/changelog.d/20230522_181022_regis_olive_4.md b/changelog.d/20230522_181022_regis_olive_4.md new file mode 100644 index 0000000..2ba3d7f --- /dev/null +++ b/changelog.d/20230522_181022_regis_olive_4.md @@ -0,0 +1 @@ +- [Feature] Upgrade to open-release/olive.4. (by @regisb) diff --git a/docs/configuration.rst b/docs/configuration.rst index 272b5ea..927eb31 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -130,7 +130,7 @@ Open edX customisation This defines the git repository from which you install Open edX platform code. If you run an Open edX fork with custom patches, set this to your own git repository. You may also override this configuration parameter at build time, by providing a ``--build-arg`` option. -- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/olive.3"``) +- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/olive.4"``) This defines the default version that will be pulled from all Open edX git repositories. diff --git a/tutor/templates/config/defaults.yml b/tutor/templates/config/defaults.yml index 95d2b8f..6e0d2dc 100644 --- a/tutor/templates/config/defaults.yml +++ b/tutor/templates/config/defaults.yml @@ -51,7 +51,7 @@ OPENEDX_CMS_UWSGI_WORKERS: 2 OPENEDX_LMS_UWSGI_WORKERS: 2 OPENEDX_MYSQL_DATABASE: "openedx" OPENEDX_MYSQL_USERNAME: "openedx" -OPENEDX_COMMON_VERSION: "open-release/olive.3" +OPENEDX_COMMON_VERSION: "open-release/olive.4" OPENEDX_EXTRA_PIP_REQUIREMENTS: - "openedx-scorm-xblock>=15.0.0,<16.0.0" MYSQL_HOST: "mysql" From 185a13a2e1818e5df4298b0d4a1a18217d2303f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Mon, 22 May 2023 18:17:34 +0200 Subject: [PATCH 2/2] v15.3.6 --- CHANGELOG.md | 5 +++++ changelog.d/20230522_181022_regis_olive_4.md | 1 - tutor/__about__.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/20230522_181022_regis_olive_4.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fc89ad..a581646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,11 @@ instructions, because git commits are used to generate release notes: + +## v15.3.6 (2023-05-22) + +- [Feature] Upgrade to open-release/olive.4. (by @regisb) + ## v15.3.5 (2023-04-28) diff --git a/changelog.d/20230522_181022_regis_olive_4.md b/changelog.d/20230522_181022_regis_olive_4.md deleted file mode 100644 index 2ba3d7f..0000000 --- a/changelog.d/20230522_181022_regis_olive_4.md +++ /dev/null @@ -1 +0,0 @@ -- [Feature] Upgrade to open-release/olive.4. (by @regisb) diff --git a/tutor/__about__.py b/tutor/__about__.py index 1723baa..9de59f0 100644 --- a/tutor/__about__.py +++ b/tutor/__about__.py @@ -2,7 +2,7 @@ import os # Increment this version number to trigger a new release. See # docs/tutor.html#versioning for information on the versioning scheme. -__version__ = "15.3.5" +__version__ = "15.3.6" # 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