updated to django 5

cookbook/views/api.py

@@ -35,7 +35,6 @@ from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.dateparse import parse_datetime
-from django.utils.datetime_safe import date
 from django.utils.translation import gettext as _
 from django_scopes import scopes_disabled
 from drf_spectacular.types import OpenApiTypes
@@ -134,7 +133,7 @@ class LoggingMixin(object):
 
         if settings.REDIS_HOST:
             try:
-                d = date.today().isoformat()
+                d = timezone.now().isoformat()
                 space = request.space
                 endpoint = request.resolver_match.url_name
 

cookbook/views/views.py

@@ -21,7 +21,7 @@ from django.http import HttpResponseRedirect, JsonResponse, HttpResponse
 from django.shortcuts import get_object_or_404, render
 from django.templatetags.static import static
 from django.urls import reverse, reverse_lazy
-from django.utils.datetime_safe import date
+from django.utils import timezone
 from django.utils.translation import gettext as _
 from django_scopes import scopes_disabled
 from drf_spectacular.views import SpectacularRedocView, SpectacularSwaggerView
@@ -223,7 +223,7 @@ def system(request):
         total_stats = ['All', int(r.get('api:request-count'))]
 
         for i in range(0, 6):
-            d = (date.today() - timedelta(days=i)).isoformat()
+            d = (timezone.now() - timedelta(days=i)).isoformat()
             api_stats[0].append(d)
             api_space_stats[0].append(d)
             total_stats.append(int(r.get(f'api:request-count:{d}')) if r.get(f'api:request-count:{d}') else 0)
@@ -234,7 +234,7 @@ def system(request):
             endpoint = x[0].decode('utf-8')
             endpoint_stats = [endpoint, x[1]]
             for i in range(0, 6):
-                d = (date.today() - timedelta(days=i)).isoformat()
+                d = (timezone.now() - timedelta(days=i)).isoformat()
                 endpoint_stats.append(r.zscore(f'api:endpoint-request-count:{d}', endpoint))
             api_stats.append(endpoint_stats)
 
@@ -243,7 +243,7 @@ def system(request):
             if space := Space.objects.filter(pk=s).first():
                 space_stats = [space.name, x[1]]
                 for i in range(0, 6):
-                    d = (date.today() - timedelta(days=i)).isoformat()
+                    d = (timezone.now() - timedelta(days=i)).isoformat()
                     space_stats.append(r.zscore(f'api:space-request-count:{d}', s))
                 api_space_stats.append(space_stats)
 

recipes/settings.py

@@ -565,8 +565,6 @@ else:
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 LANGUAGES = [
@@ -594,8 +592,18 @@ LANGUAGES = [
 
 AWS_ENABLED = True if os.getenv('S3_ACCESS_KEY', False) else False
 
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    # Serve static files with gzip
+    "staticfiles": {
+        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+    },
+}
+
 if os.getenv('S3_ACCESS_KEY', ''):
-    DEFAULT_FILE_STORAGE = 'cookbook.helper.CustomStorageClass.CachedS3Boto3Storage'
+    STORAGES['default']['BACKEND'] = 'cookbook.helper.CustomStorageClass.CachedS3Boto3Storage'
 
     AWS_ACCESS_KEY_ID = os.getenv('S3_ACCESS_KEY', '')
     AWS_SECRET_ACCESS_KEY = os.getenv('S3_SECRET_ACCESS_KEY', '')
@@ -610,14 +618,9 @@ if os.getenv('S3_ACCESS_KEY', ''):
     if os.getenv('S3_CUSTOM_DOMAIN', ''):
         AWS_S3_CUSTOM_DOMAIN = os.getenv('S3_CUSTOM_DOMAIN', '')
 
-    MEDIA_URL = os.getenv('MEDIA_URL', '/media/')
-    MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles"))
-else:
-    MEDIA_URL = os.getenv('MEDIA_URL', '/media/')
-    MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles"))
 
-# Serve static files with gzip
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+MEDIA_URL = os.getenv('MEDIA_URL', '/media/')
+MEDIA_ROOT = os.getenv('MEDIA_ROOT', os.path.join(BASE_DIR, "mediafiles"))
 
 # settings for cross site origin (CORS)
 # all origins allowed to support bookmarklet

requirements.txt

@@ -1,4 +1,4 @@
-Django==4.2.24
+Django==5.2.6
 cryptography===45.0.5
 django-annoying==0.10.6
 django-cleanup==9.0.0