From c9ac22c4edf45b7c5eab37d6ee3eb77c91abd2c9 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 cd8474961..1871d662b 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.22 +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.2.1 @@ -33,7 +33,7 @@ python-dateutil==2.8.2 requests[security]>=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 3c64323afbf04b1eb0fa8a7341606b8397709d44 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 1871d662b..3e99f6b51 100644 --- a/base-requirements.txt +++ b/base-requirements.txt @@ -33,7 +33,7 @@ python-dateutil==2.8.2 requests[security]>=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 dac9d96300c8d5db951857dd09a12a30ba48244e 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 15c423f7fbbe11cb08488693d033cc80d1b052b1 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 --- sponsors/admin.py | 4 +++- successstories/tests/test_models.py | 2 +- templates/sitetree/breadcrumbs.html | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sponsors/admin.py b/sponsors/admin.py index dc7278c08..d3084004a 100644 --- a/sponsors/admin.py +++ b/sponsors/admin.py @@ -201,6 +201,9 @@ def get_prepopulated_fields(self, request, obj=None): return {'slug': ['name']} return {} + @admin.display( + description="Revenue split" + ) def get_benefit_split(self, obj: SponsorshipPackage) -> str: colors = [ "#ffde57", # Python Gold @@ -223,7 +226,6 @@ def get_benefit_split(self, obj: SponsorshipPackage) -> str: html = f"
{''.join(spans)}
" return mark_safe(html) - get_benefit_split.short_description = "Revenue split" class SponsorContactInline(admin.TabularInline): diff --git a/successstories/tests/test_models.py b/successstories/tests/test_models.py index 418d27062..f88f0ff36 100644 --- a/successstories/tests/test_models.py +++ b/successstories/tests/test_models.py @@ -21,7 +21,7 @@ def test_draft(self): def test_featured(self): featured_stories = Story.objects.featured() expected_repr = [f''] - self.assertQuerysetEqual(featured_stories, expected_repr, transform=repr) + self.assertQuerySetEqual(featured_stories, expected_repr, transform=repr) def test_get_admin_url(self): self.assertEqual(self.story1.get_admin_url(), 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 e786cacedaa228881487d1e3884e5c035e07a48a Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 13 Jun 2025 11:29:05 -0500 Subject: [PATCH 5/6] deps: update django countries to support django 5.2 version, passing test Ran 1 test in 0.064s --- base-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base-requirements.txt b/base-requirements.txt index 3e99f6b51..0dfba2f18 100644 --- a/base-requirements.txt +++ b/base-requirements.txt @@ -44,7 +44,7 @@ djangorestframework==3.14.0 # 3.14.0 is first version that supports Django 4.1, django-filter==2.4.0 django-ordered-model==3.7.4 django-widget-tweaks==1.5.0 -django-countries==7.2.1 +django-countries==7.6.1 num2words==0.5.13 django-polymorphic==3.1.0 # 3.1.0 is first version that supports Django 4.0, unsure if it fully supports 4.2 sorl-thumbnail==12.11.0 From a2090912318529a733587ef9f84c5d27a64ecd62 Mon Sep 17 00:00:00 2001 From: Jacob Coffee Date: Fri, 13 Jun 2025 11:40:51 -0500 Subject: [PATCH 6/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 0dfba2f18..3049abad0 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==7.6.1 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)