From a0c66ca6509cfe0e1993c1af12c7eadf177c38a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 16 Nov 2023 19:04:55 +0100 Subject: [PATCH 1/4] feat: upgrade to palm.4 --- changelog.d/20231116_185835_regis_palm_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/20231116_185835_regis_palm_4.md diff --git a/changelog.d/20231116_185835_regis_palm_4.md b/changelog.d/20231116_185835_regis_palm_4.md new file mode 100644 index 0000000..4fe9765 --- /dev/null +++ b/changelog.d/20231116_185835_regis_palm_4.md @@ -0,0 +1 @@ +- [Feature] Upgrade to open-release/palm.4. It is strongly recommended to upgrade to this release for as long as possible before upgrading to Quince. Otherwise, many users will be logged out after the Quince upgrade and will have to log in again -- see the Quince release notes. (by @regisb) diff --git a/docs/configuration.rst b/docs/configuration.rst index 720b6cd..9375da5 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -136,7 +136,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/palm.3"``) +- ``OPENEDX_COMMON_VERSION`` (default: ``"open-release/palm.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 94f1272..1eb1bac 100644 --- a/tutor/templates/config/defaults.yml +++ b/tutor/templates/config/defaults.yml @@ -52,7 +52,7 @@ OPENEDX_CMS_UWSGI_WORKERS: 2 OPENEDX_LMS_UWSGI_WORKERS: 2 OPENEDX_MYSQL_DATABASE: "openedx" OPENEDX_MYSQL_USERNAME: "openedx" -OPENEDX_COMMON_VERSION: "open-release/palm.3" +OPENEDX_COMMON_VERSION: "open-release/palm.4" OPENEDX_EXTRA_PIP_REQUIREMENTS: - "openedx-scorm-xblock>=16.0.0,<17.0.0" MYSQL_HOST: "mysql" From 01971f572bf0b04c43ca75393fce4397069f83c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 16 Nov 2023 22:38:10 +0100 Subject: [PATCH 2/4] v16.1.6 --- CHANGELOG.md | 6 ++++++ changelog.d/20231106_202213_codewithemad.md | 1 - changelog.d/20231116_185835_regis_palm_4.md | 1 - tutor/__about__.py | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/20231106_202213_codewithemad.md delete mode 100644 changelog.d/20231116_185835_regis_palm_4.md diff --git a/CHANGELOG.md b/CHANGELOG.md index e9da88a..adbc35a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,12 @@ instructions, because git commits are used to generate release notes: + +## v16.1.6 (2023-11-16) + +- [Feature] Upgrade to open-release/palm.4. It is strongly recommended to upgrade to this release for as long as possible before upgrading to Quince. Otherwise, many users will be logged out after the Quince upgrade and will have to log in again -- see the Quince release notes. (by @regisb) +- [Improvement] Install tutor development tools with `pip install tutor[dev]`. (by @CodeWithEmad) + ## v16.1.5 (2023-10-30) diff --git a/changelog.d/20231106_202213_codewithemad.md b/changelog.d/20231106_202213_codewithemad.md deleted file mode 100644 index 37d04ec..0000000 --- a/changelog.d/20231106_202213_codewithemad.md +++ /dev/null @@ -1 +0,0 @@ -- [Improvement] Install tutor development tools with `pip install tutor[dev]`. (by @CodeWithEmad) \ No newline at end of file diff --git a/changelog.d/20231116_185835_regis_palm_4.md b/changelog.d/20231116_185835_regis_palm_4.md deleted file mode 100644 index 4fe9765..0000000 --- a/changelog.d/20231116_185835_regis_palm_4.md +++ /dev/null @@ -1 +0,0 @@ -- [Feature] Upgrade to open-release/palm.4. It is strongly recommended to upgrade to this release for as long as possible before upgrading to Quince. Otherwise, many users will be logged out after the Quince upgrade and will have to log in again -- see the Quince release notes. (by @regisb) diff --git a/tutor/__about__.py b/tutor/__about__.py index 300e839..c70f740 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__ = "16.1.5" +__version__ = "16.1.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 From 66fce06e44504c2b077d307abe64f6a6331c78f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Fri, 17 Nov 2023 10:29:24 +0100 Subject: [PATCH 3/4] fix: missing dev.txt file in pypi package Close #943. --- MANIFEST.in | 1 + changelog.d/20231117_102830_regis.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelog.d/20231117_102830_regis.md diff --git a/MANIFEST.in b/MANIFEST.in index 9b2c42c..7d53c0c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,5 @@ include requirements/base.in include requirements/plugins.txt +include requirements/dev.txt recursive-include tutor/templates * include tutor/py.typed diff --git a/changelog.d/20231117_102830_regis.md b/changelog.d/20231117_102830_regis.md new file mode 100644 index 0000000..4682872 --- /dev/null +++ b/changelog.d/20231117_102830_regis.md @@ -0,0 +1 @@ +- [Bugfix] Fix installation of tutor due to missing dev.txt file in Python package. (by @regisb) From e02d4274ee03d5344a67e2d1d5bf151c4403a985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Fri, 17 Nov 2023 10:34:21 +0100 Subject: [PATCH 4/4] v16.1.7 --- CHANGELOG.md | 8 +++++++- changelog.d/20231117_102830_regis.md | 1 - tutor/__about__.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/20231117_102830_regis.md diff --git a/CHANGELOG.md b/CHANGELOG.md index adbc35a..90ab33e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,10 +20,16 @@ instructions, because git commits are used to generate release notes: + +## v16.1.7 (2023-11-17) + +- [Feature] Upgrade to open-release/palm.4. It is strongly recommended to upgrade to this release for as long as possible before upgrading to Quince. Otherwise, many users will be logged out after the Quince upgrade and will have to log in again -- see the Quince release notes. (by @regisb) +- [Bugfix] Fix installation of tutor due to missing dev.txt file in Python package. (by @regisb) + ## v16.1.6 (2023-11-16) -- [Feature] Upgrade to open-release/palm.4. It is strongly recommended to upgrade to this release for as long as possible before upgrading to Quince. Otherwise, many users will be logged out after the Quince upgrade and will have to log in again -- see the Quince release notes. (by @regisb) +- [Feature] Upgrade to open-release/palm.4. (by @regisb) - [Improvement] Install tutor development tools with `pip install tutor[dev]`. (by @CodeWithEmad) diff --git a/changelog.d/20231117_102830_regis.md b/changelog.d/20231117_102830_regis.md deleted file mode 100644 index 4682872..0000000 --- a/changelog.d/20231117_102830_regis.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Fix installation of tutor due to missing dev.txt file in Python package. (by @regisb) diff --git a/tutor/__about__.py b/tutor/__about__.py index c70f740..60760ec 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__ = "16.1.6" +__version__ = "16.1.7" # 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