Merge branch 'master' into nightly

magoldev · Nov 20, 2023 · 2b490e5 · 2b490e5
2 parents fbefe52 + e02d427
commit 2b490e5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,18 @@ instructions, because git commits are used to generate release notes:
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-16.1.7'></a>
+## 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)
+
+<a id='changelog-16.1.6'></a>
+## v16.1.6 (2023-11-16)
+
+- [Feature] Upgrade to open-release/palm.4. (by @regisb)
+- [Improvement] Install tutor development tools with `pip install tutor[dev]`. (by @CodeWithEmad)
+
 <a id='changelog-16.1.5'></a>
 ## v16.1.5 (2023-10-30)
 

diff --git 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/20231106_202213_codewithemad.md b/changelog.d/20231106_202213_codewithemad.md
diff --git 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/__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__ = "16.1.5"
+__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