Merge remote-tracking branch 'origin/release'

overhangio · Nov 28, 2024 · aa1c67a · aa1c67a
2 parents d43952b + b7af7ba
commit aa1c67a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,16 @@ instructions, because git commits are used to generate release notes:
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-18.0.1'></a>
+## v18.0.1 (2024-11-28)
+
+- [Bugfix] Fix legacy warnings during Docker build. (by @regisb)
+- 💥[Feature] Update android image to use Ubuntu `24.04` as base OS. (by @Abdul-Muqadim-Arbisoft)
+- 💥 [Deprecation] Drop support for python 3.8 and set Python 3.9 as the minimum supported python version. (by @Abdul-Muqadim-Arbisoft)
+- 💥[Improvement] Rename Tutor's two branches (by @DawoudSheraz):
+  * Rename **master** to **release**, as this branch runs the latest official Open edX release tag.
+  * Rename **nightly** to **main**, as this branch runs the Open edX master branches, which are the basis for the next Open edX release.
+
 <a id='changelog-18.0.0'></a>
 ## v18.0.0 (2024-06-20)
 

diff --git a/changelog.d/20240621_170044_regis.md b/changelog.d/20240621_170044_regis.md
diff --git a/changelog.d/20241025_191448_abdul.muqadim_ubuntu_upgrade.md b/changelog.d/20241025_191448_abdul.muqadim_ubuntu_upgrade.md
diff --git a/changelog.d/20241114_113827_abdul.muqadim_remove_py3_8_references.md b/changelog.d/20241114_113827_abdul.muqadim_remove_py3_8_references.md
diff --git a/changelog.d/20241119_175930_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_175930_dawoud.sheraz_branch_rename.md
diff --git a/tutorandroid/__about__.py b/tutorandroid/__about__.py
@@ -1 +1 @@
-__version__ = "18.0.0"
+__version__ = "18.0.1"