diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 4ef4447536ba9422b44e1e91b34223da0aa80b28..90429c18f6ef5f0039a2b5934fca842a2b0f391f 100644 --- a/CHANGELOG.rst +++ b/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 diff --git a/aleksis/core/migrations/0035_preference_model_unique.py b/aleksis/core/migrations/0035_preference_model_unique.py index 0c82528eff8655f356cddb5705623fb5cd4a6120..863da1d08ec2dcdb5786691381b5b80000c61fe3 100644 --- a/aleksis/core/migrations/0035_preference_model_unique.py +++ b/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 diff --git a/docs/conf.py b/docs/conf.py index faf02551a28f85c258edabf0dd2253d054e07344..ece3564f48d5fdc2fae958ed2bc32cdd5e235113 100644 --- a/docs/conf.py +++ b/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 --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index 0587d6373842c71e486667f13036971d2cd9cb72..aacf9a224168fc01da2cae9ef94c0f24a676b9a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "AlekSIS-Core" -version = "2.7.1.dev0" +version = "2.7.2.dev0" packages = [ { include = "aleksis" } ]