Fix collectstatic crash caused by s3 and django-storages 1.14.4

svthalia · Nov 15, 2024 · 718db40 · 718db40
1 parent b1f2179
commit 718db40
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 24 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,7 +22,7 @@ dependencies = [
     "django-admin-autocomplete-filter==0.7.1",
     "django-bootstrap5~=22.1",
     "django-tinymce==4.1.0",
-    "django-storages==1.14.4",
+    "django-storages==1.14.3",
     "django-drf-filepond==0.5.0",
     "django-filepond-widget==0.9.0",
     "django-thumbnails==0.8.0",
@@ -48,7 +48,7 @@ dependencies = [
     "inflection~=0.5.1",
     "uritemplate~=4.1.1",
     "puremagic~=1.27",
-    "psycopg2-binary==2.9.10"
+    "psycopg[binary]~=3.2.3",
 ]
 
 [dependency-groups]

diff --git a/uv.lock b/uv.lock
diff --git a/website/thaliawebsite/storage/backend.py b/website/thaliawebsite/storage/backend.py
@@ -46,9 +46,7 @@ def url(self, name, attachment=False, expire_seconds=None):
                 f'attachment; filename="{attachment}"'
             )
 
-        url = super().url(name, params, expire=expire_seconds)
-
-        return url
+        return super().url(name, params, expire=expire_seconds)
 
 
 class PrivateS3Storage(S3RenameMixin, S3Boto3Storage):