Merge pull request #457 from bruecksen/456-update-wagtail

#456 update wagtail and django to latest LTS versions

Author: bruecksen

bakeup/core/utils.py

@@ -1,5 +1,5 @@
 from django.contrib.admin.utils import NestedObjects
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.text import capfirst
 
 
@@ -10,7 +10,7 @@ def get_deleted_objects(objs):
     #
     def format_callback(obj):
         opts = obj._meta
-        no_edit_link = "%s: %s" % (capfirst(opts.verbose_name), force_text(obj))
+        no_edit_link = "%s: %s" % (capfirst(opts.verbose_name), force_str(obj))
         return no_edit_link
 
     #

bakeup/pages/wagtail_hooks.py

@@ -1,5 +1,5 @@
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from wagtail import hooks
 from wagtailmenus.models import MainMenu
 

bakeup/users/__init__.py

@@ -1 +0,0 @@
-default_app_config = "bakeup.users.apps.UsersConfig"

bakeup/users/admin.py

@@ -35,14 +35,10 @@ def change_view(self, request, object_id, form_url="", extra_context=None):
         self.request = request
         return super().change_view(request, object_id, form_url, extra_context)
 
+    @admin.display(description="Token URL")
     def token_url(self, obj):
         return obj.token_url(self.request)
 
-    token_url.short_description = "Token URL"
-    token_url.allow_tags = True
-
+    @admin.display(description="QR Code")
     def qr_code_svg(self, obj):
         return obj.qr_code_svg(self.request)
-
-    qr_code_svg.short_description = "QR Code"
-    qr_code_svg.allow_tags = True

config/settings/base.py

@@ -31,7 +31,6 @@
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n
 USE_I18N = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-l10n
-USE_L10N = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-tz
 USE_TZ = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths
@@ -94,7 +93,6 @@
     "sorl.thumbnail",
     "django.contrib.auth",
     "django.contrib.sessions",
-    "wagtail.contrib.modeladmin",
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",
     "wagtail.contrib.settings",
@@ -189,6 +187,7 @@
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
     "bakeup.core.middleware.PersistentFiltersMiddleware",
+    "allauth.account.middleware.AccountMiddleware",
 ]
 
 # STATIC

config/settings/production.py

@@ -3,7 +3,6 @@
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.logging import LoggingIntegration
-from sentry_sdk.integrations.redis import RedisIntegration
 
 from .base import *  # noqa
 from .base import env
@@ -22,21 +21,6 @@
 DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60)  # noqa F405
 DATABASES["default"]["ENGINE"] = "django_tenants.postgresql_backend"  # noqa F405
 
-# CACHES
-# ------------------------------------------------------------------------------
-# CACHES = {
-#     "default": {
-#         "BACKEND": "django_redis.cache.RedisCache",
-#         "LOCATION": env("REDIS_URL"),
-#         "OPTIONS": {
-#             "CLIENT_CLASS": "django_redis.client.DefaultClient",
-#             # Mimicing memcache behavior.
-#             # https://github.com/jazzband/django-redis#memcached-exceptions-behavior
-#             "IGNORE_EXCEPTIONS": True,
-#         },
-#     }
-# }
-
 CACHES = {
     "default": {
         "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
@@ -72,7 +56,14 @@
 
 # STATIC
 # ------------------------
-STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    "staticfiles": {
+        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+    },
+}
 # MEDIA
 # ------------------------------------------------------------------------------
 
@@ -163,7 +154,7 @@
     level=SENTRY_LOG_LEVEL,  # Capture info and above as breadcrumbs
     event_level=logging.ERROR,  # Send errors as events
 )
-integrations = [sentry_logging, DjangoIntegration(), RedisIntegration()]
+integrations = [sentry_logging, DjangoIntegration()]
 sentry_sdk.init(
     send_default_pii=True,
     dsn=SENTRY_DSN,

config/urls.py

@@ -2,7 +2,7 @@
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
-from django.urls import include, path, re_path
+from django.urls import include, path
 from django.views import defaults as default_views
 from django.views.generic import RedirectView
 from wagtail import urls as wagtail_urls
@@ -26,7 +26,7 @@
     path("users/", include("bakeup.users.urls", namespace="users")),
     path("workshop/", include("bakeup.workshop.urls", namespace="workshop")),
     path("shop/", include("bakeup.shop.urls", namespace="shop")),
-    re_path(r"shop/", include(wagtail_urls)),
+    path("shop/", include(wagtail_urls)),
     # path("login/", LoginView.as_view(), name='login'),
     path("logout/", auth_views.LogoutView.as_view(), name="logout"),
     path(

requirements/base.txt

@@ -1,34 +1,31 @@
-pytz==2021.3  # https://github.com/stub42/pytz
+pytz==2024.1  # https://github.com/stub42/pytz
 python-slugify==6.1.1  # https://github.com/un33k/python-slugify
-Pillow==9.0.1  # https://github.com/python-pillow/Pillow
-argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
-whitenoise==6.0.0  # https://github.com/evansd/whitenoise
-redis==4.1.4  # https://github.com/redis/redis-py
-hiredis==2.0.0  # https://github.com/redis/hiredis-py
+Pillow==10.2.0  # https://github.com/python-pillow/Pillow
+argon2-cffi==23.1.0  # https://github.com/hynek/argon2_cffi
+whitenoise==6.6.0  # https://github.com/evansd/whitenoise
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.12  # pyup: < 4.0  # https://www.djangoproject.com/
-django-environ==0.8.1  # https://github.com/joke2k/django-environ
-django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
-django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
-crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
-django-redis==5.2.0  # https://github.com/jazzband/django-redis
-django-recurrence==1.11.1
-django-tables2==2.4.1
-django-treebeard==4.5.1
-sorl-thumbnail==12.8.0
-django_bootstrap5==21.3
-django_filter==21.1
+django==4.2.11  # pyup: < 5.0  # https://www.djangoproject.com/
+django-environ==0.11.2  # https://github.com/joke2k/django-environ
+django-model-utils==4.4.0  # https://github.com/jazzband/django-model-utils
+django-allauth==0.61.1  # https://github.com/pennersr/django-allauth
+django-crispy-forms==2.1  # https://github.com/django-crispy-forms/django-crispy-forms
+crispy-bootstrap5==2024.2  # https://github.com/django-crispy-forms/crispy-bootstrap5
+
+django-tables2==2.7.0
+django-treebeard==4.7.1
+sorl-thumbnail==12.10.0
+django_bootstrap5==23.4
+django_filter==23.5
 django-tenants==3.6.1
-qrcode==7.3.1
-django-taggit==3.0.0
-django-allauth==0.49.0
-django-persistent-filters==0.21
-django-htmx==1.14.0
-wagtail==4.2.*
-tablib==3.4.0
-wagtailmenus==3.1.7
+qrcode==7.4.2
+django-taggit==4.0.0
+django-persistent-filters==1.0
+django-htmx==1.17.3
+wagtail==5.2.*
+tablib==3.5.0
+wagtailmenus==4.0
 babel==2.9.1 # newer version fails because of langauge variants https://github.com/python-babel/babel/issues/454
-django-money==3.2.0
-django-autocomplete-light==3.9.7
+django-money==3.4.1
+django-autocomplete-light==3.11.0