From c921f927697167db2feb1e774a6ee0758492e92f Mon Sep 17 00:00:00 2001
From: Hrafn Malmquist <hrafn.malmquist@gmail.com>
Date: Thu, 2 Jul 2026 13:00:02 +0100
Subject: [PATCH 1/2] Bump Django to 5.2

---
 core/helper/query_serv.py |  2 +-
 manifestation/tests.py    |  2 +-
 pyproject.toml            | 17 ++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/helper/query_serv.py b/core/helper/query_serv.py
index 893d2a0e..6b43f3d8 100644
--- a/core/helper/query_serv.py
+++ b/core/helper/query_serv.py
@@ -493,7 +493,7 @@ def convert_queryset_to_sql(queryset: QuerySet) -> str:
     >>> from login.models import CofkUser
     >>> queryset = CofkUser.objects.filter().values('email').filter(email='x')
     >>> convert_queryset_to_sql(queryset)
-    'SELECT "cofk_user"."email" FROM "cofk_user" WHERE "cofk_user"."email" = x'
+    'SELECT "cofk_user"."email" AS "email" FROM "cofk_user" WHERE "cofk_user"."email" = x'
 
     Parameters
     ----------
diff --git a/manifestation/tests.py b/manifestation/tests.py
index 85ff5c45..1cb4f446 100644
--- a/manifestation/tests.py
+++ b/manifestation/tests.py
@@ -30,7 +30,7 @@ def test_no_results(self):
         view = ManifSearchView()
         view.setup(request)
 
-        self.assertQuerysetEqual(view.get_queryset(), [])
+        self.assertQuerySetEqual(view.get_queryset(), [])
 
 
 def prepare_manif_records() -> list[CofkUnionManifestation]:
diff --git a/pyproject.toml b/pyproject.toml
index 1374020c..214f97f8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,20 +7,19 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
 ]
 dependencies = [
-    'asgiref==3.5.2',
-    'Django==4.0.6',
+    'Django==5.2.15',
     'django-q2==1.6.1',
-    'openpyxl==3.0.10',
-    'psycopg2==2.9.3',
-    'pycountry==22.3.5',
-    'sqlparse==0.4.2',
+    'openpyxl~=3.1',
+    'psycopg2~=2.9',
+    'pycountry>=22.3',
+
     'selenium~=4.15',
     'django-compressor~=4.0',
-    'django-sass-processor~=1.2.1',
+    'django-sass-processor>=1.3',
     'libsass~=0.21.0',
-    'Pillow~=9.2.0',
+    'Pillow~=11.0',
     'python-dateutil',
-    'requests~=2.28.1',
+    'requests~=2.32',
     'gunicorn~=23.0',
     'beautifulsoup4~=4.11.2',
     'more-itertools~=9.1',

From 6cfca0ba2666fa15c0d68f70c64d3a1f28644c48 Mon Sep 17 00:00:00 2001
From: Hrafn Malmquist <hrafn.malmquist@gmail.com>
Date: Thu, 2 Jul 2026 13:15:12 +0100
Subject: [PATCH 2/2] Bump Django q2 and fix STATIC_ROOT config

---
 pyproject.toml             | 2 +-
 siteedit2/settings/base.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 214f97f8..c2701a1c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ classifiers = [
 ]
 dependencies = [
     'Django==5.2.15',
-    'django-q2==1.6.1',
+    'django-q2~=1.8',
     'openpyxl~=3.1',
     'psycopg2~=2.9',
     'pycountry>=22.3',
diff --git a/siteedit2/settings/base.py b/siteedit2/settings/base.py
index bd2ed181..42c1dca0 100644
--- a/siteedit2/settings/base.py
+++ b/siteedit2/settings/base.py
@@ -236,6 +236,7 @@
 # https://docs.djangoproject.com/en/4.0/howto/static-files/
 
 STATIC_URL = 'static/'
+STATIC_ROOT = BASE_DIR / 'staticfiles'
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field