Merge branch 'prepare-release-2.7.1' into 'master'

Prepare release 2.7.1

See merge request !940

CHANGELOG.rst

@@ -9,17 +9,16 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
-Added
-~~~~~
-
-* [OAuth] Expired tokens are now cleared in a periodic task
-* PDF file jobs are now automatically expired
-* Data checks are now scheduled every 15 minutes by default
+`2.7.1`_ - 2022-01-28
+---------------------
 
 Changed
 ~~~~~~~
 
 * PWA icons can now be marked maskable
+* [OAuth] Expired tokens are now cleared in a periodic task
+* PDF file jobs are now automatically expired
+* Data checks are now scheduled every 15 minutes by default
 
 Fixed
 ~~~~~
@@ -695,3 +694,4 @@ Fixed
 .. _2.5: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.5
 .. _2.6: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.6
 .. _2.7: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.7
+.. _2.7.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.7.1

aleksis/core/migrations/0035_preference_model_unique.py

@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
         PersonPreferenceModel = apps.get_model("core", "PersonPreferenceModel")
         SitePreferenceModel = apps.get_model("core", "SitePreferenceModel")
 
-        from dynamic_preferences import BasePreferenceModel
+        from dynamic_preferences.models import BasePreferenceModel
 
         models = [GroupPreferenceModel, PersonPreferenceModel, SitePreferenceModel]
 
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
                     found = False
                     for obj in objs:
                         if BasePreferenceModel.get_value(obj) == BasePreferenceModel.preference(obj).default or found:
-                            obj.delete()                    
+                            obj.delete()
                         else:
                             found = True
 

docs/conf.py

@@ -31,7 +31,7 @@ author = "The AlekSIS Team"
 # The short X.Y version
 version = "2.7"
 # The full version, including alpha/beta/rc tags
-release = "2.7.1.dev0"
+release = "2.7.2.dev0"
 
 
 # -- General configuration ---------------------------------------------------

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-Core"
-version = "2.7.1.dev0"
+version = "2.7.2.dev0"
 packages = [
     { include = "aleksis" }
 ]