Merge branch 'master' into 553-oauth-allow-apps-to-generate-claims-for-their-own-scopes

CHANGELOG.rst

@@ -14,6 +14,9 @@ Added
 
 * [OAuth] Allow apps to fill in their own claim data matching their scopes
 
+`2.2.1_ – 2021-12-02
+--------------------
+
 Fixed
 ~~~~~
 
@@ -22,6 +25,7 @@ Fixed
 * [OAuth] Fix OAuth claims for follow-up requests (e.g. UserInfo)
 * [OAuth] Fix grant types checking failing on wrong types under some circumstances
 * [OAuth] Re-introduce missing algorithm field in application form
+* Remove errornous backup folder check for S3
 
 `2.2`_ - 2021-11-29
 -------------------
@@ -504,3 +508,4 @@ Fixed
 .. _2.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.1
 .. _2.1.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.1.1
 .. _2.2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.2
+.. _2.2.1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.2.1

aleksis/core/health_checks.py

@@ -34,9 +34,6 @@ class BaseBackupHealthCheck(BaseHealthCheckBackend):
     def check_status(self):
         storage = get_storage()
         backups = storage.list_backups(content_type=self.content_type)
-        if not storage.storage.exists(""):
-            self.add_error(_("The backup folder doesn't exist."))
-            return
         if backups:
             last_backup = backups[:1]
             last_backup_time = dbbackup_utils.filename_to_date(last_backup[0])

pyproject.toml

@@ -74,7 +74,7 @@ html2text = "^2020.0.0"
 django-ckeditor = "^6.0.0"
 django-js-reverse = "^0.9.1"
 calendarweek = "^0.5.0"
-Celery = {version="^5.0.0", extras=["django", "redis"]}
+Celery = {version=">=5.0,<5.2", extras=["django", "redis"]}
 django-celery-results = "^2.0.1"
 django-celery-beat = "^2.2.0"
 django-celery-email = "^3.0.0"