diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 955b96f9c2c7e6189fa13c6cbe08c9daccfba01a..fef3a2b3de1da94c1aa11cb16cc00277cd7e5ebd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,9 @@ and this project adheres to `Semantic Versioning`_. Unreleased ---------- +`2.8`_ - 2022-03-11 +------------------- + Added ~~~~~ @@ -783,3 +786,4 @@ Fixed .. _2.7.2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.7.2 .. _2.7.3: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.7.3 .. _2.7.4: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.7.4 +.. _2.8: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.8 diff --git a/aleksis/core/views.py b/aleksis/core/views.py index 789410c80f0eaf8aa8d7c7302f701e08e1432276..32e83c3746630ddf96e5c179180dbfb2face50d2 100644 --- a/aleksis/core/views.py +++ b/aleksis/core/views.py @@ -36,7 +36,7 @@ from django.views.generic.list import ListView import reversion from allauth.account.utils import _has_verified_for_login, send_email_confirmation -from allauth.account.views import PasswordChangeView, SignupView, PasswordResetView +from allauth.account.views import PasswordChangeView, PasswordResetView, SignupView from allauth.socialaccount.adapter import get_adapter from allauth.socialaccount.models import SocialAccount from celery_progress.views import get_progress diff --git a/docs/conf.py b/docs/conf.py index 7ce65bcd98683c01f7ae33999ee15fc67d3cbd5e..8016962654e9a2a5659c9fc73b815ef38bd42658 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -31,7 +31,7 @@ author = "The AlekSIS Team" # The short X.Y version version = "2.8" # The full version, including alpha/beta/rc tags -release = "2.8.dev0" +release = "2.8.1.dev0" # -- General configuration --------------------------------------------------- diff --git a/pyproject.toml b/pyproject.toml index f0b31a7093dada82e5dfde5b9025ac09c2dcdb6a..88e204bb8c43087ce049f5de9ff8353db17e7695 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "AlekSIS-Core" -version = "2.8.dev0" +version = "2.8.1.dev0" packages = [ { include = "aleksis" } ] @@ -135,7 +135,7 @@ s3 = ["boto3", "django-storages"] sentry = ["sentry-sdk"] [tool.poetry.dev-dependencies] -aleksis-builddeps = "^6" +aleksis-builddeps = "*" uwsgi = "^2.0" [tool.poetry.scripts]