From ece32d681084ee7f0bd6b86a7e35ffc8e1237e70 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 13 Jun 2025 10:26:39 -0500 Subject: [PATCH 1/6] deps: update to django 5.2 --- base-requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base-requirements.txt b/base-requirements.txt index 0b6338c3e..94ad6e4f1 100644 --- a/base-requirements.txt +++ b/base-requirements.txt @@ -4,7 +4,7 @@ django-sitetree==1.18.0 # >=1.17.1 is (?) first version that supports Django 4. django-apptemplates==1.5 django-admin-interface==0.28.9 django-translation-aliases==0.1.0 -Django==4.2.27 +Django==5.2 docutils==0.21.2 Markdown==3.7 cmarkgfm==2024.11.20 @@ -20,7 +20,7 @@ beautifulsoup4==4.12.3 icalendar==4.0.7 chardet==4.0.0 celery[redis]==5.4.0 -django-celery-beat==2.5.0 +django-celery-beat==2.8.1 # TODO: We may drop 'django-imagekit' completely. django-imagekit==5.0 # 5.0 is first version that supports Django 4.2 django-haystack==3.3.0 @@ -33,7 +33,7 @@ python-dateutil==2.8.2 requests>=2.26.0 -django-honeypot==1.0.4 # 1.0.4 is first version that supports Django 4.2 +django-honeypot>=1.2.0 # TODO: 5.2 support django-markupfield==2.0.1 django-allauth==64.2.1 From 33aba5c056b024a469122b577d6178c0f2981e63 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 13 Jun 2025 10:52:28 -0500 Subject: [PATCH 2/6] deps: update honeypot to support django 5.2 version --- base-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base-requirements.txt b/base-requirements.txt index 94ad6e4f1..6d5b4f8fc 100644 --- a/base-requirements.txt +++ b/base-requirements.txt @@ -33,7 +33,7 @@ python-dateutil==2.8.2 requests>=2.26.0 -django-honeypot>=1.2.0 # TODO: 5.2 support +django-honeypot>=1.3.0 django-markupfield==2.0.1 django-allauth==64.2.1 From fabd824348dda0056b7527bad3f3e0c6d87326bd Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 13 Jun 2025 11:04:03 -0500 Subject: [PATCH 3/6] deps: update dbt to support django 5.2 version --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 1ee11a333..1a5b5982b 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -9,7 +9,7 @@ responses==0.13.3 # Extra stuff required for local dev -django-debug-toolbar==3.2.1 +django-debug-toolbar==5.2.0 coverage ddt model-bakery==1.4.0 From ed2e18bd3d749ce424b1438479be0c3208ff1024 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 13 Jun 2025 11:14:55 -0500 Subject: [PATCH 4/6] django-upgrade --target-version 5.2 --- templates/sitetree/breadcrumbs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sitetree/breadcrumbs.html b/templates/sitetree/breadcrumbs.html index 5ec72815c..8d420a143 100644 --- a/templates/sitetree/breadcrumbs.html +++ b/templates/sitetree/breadcrumbs.html @@ -1,5 +1,5 @@ {% load sitetree %} -{% if sitetree_items|length_is:"1" %} +{% if sitetree_items|length == 1 %} {% else %}
    {% for item in sitetree_items %} From f6271c989aabdf68a0215ea3ddac9fd6b1a5ee2a Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 13 Jun 2025 11:40:51 -0500 Subject: [PATCH 5/6] deps: update django-filter to support django 5.2 version, passing test --- base-requirements.txt | 2 +- sponsors/tests/test_admin.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/base-requirements.txt b/base-requirements.txt index 6d5b4f8fc..896d65760 100644 --- a/base-requirements.txt +++ b/base-requirements.txt @@ -41,7 +41,7 @@ django-allauth==64.2.1 django-waffle==2.2.1 djangorestframework==3.14.0 # 3.14.0 is first version that supports Django 4.1, 4.2 support hasnt been "released" -django-filter==2.4.0 +django-filter==25.1 django-ordered-model==3.7.4 django-widget-tweaks==1.5.0 django-countries==8.2.0 diff --git a/sponsors/tests/test_admin.py b/sponsors/tests/test_admin.py index 1e94fa6df..6f09e0b8c 100644 --- a/sponsors/tests/test_admin.py +++ b/sponsors/tests/test_admin.py @@ -57,6 +57,7 @@ def test_filter_queryset(self): def test_choices_with_custom_text_for_all(self): lookups = self.filter.lookups(self.request, self.model_admin) changelist = Mock(ChangeList, autospec=True) + changelist.add_facets = False choices = self.filter.choices(changelist) self.assertEqual(len(choices), len(lookups) + 1) From 8dbbb7b187776e6e3934c609b53f56fe7d9be155 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Mon, 15 Dec 2025 14:58:41 -0600 Subject: [PATCH 6/6] bump dj-pipeline --- base-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base-requirements.txt b/base-requirements.txt index 896d65760..4c32ebbce 100644 --- a/base-requirements.txt +++ b/base-requirements.txt @@ -1,5 +1,5 @@ dj-database-url==0.5.0 -django-pipeline==3.1.0 # 3.0.0 is first version that supports Django 4.2 +django-pipeline==4.0.0 django-sitetree==1.18.0 # >=1.17.1 is (?) first version that supports Django 4.2 django-apptemplates==1.5 django-admin-interface==0.28.9