Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions base-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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.1.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
django-translation-aliases==0.1.0
Django==4.2.27
Django==5.2
docutils==0.21.2
Markdown==3.7
cmarkgfm==2024.11.20
Expand All @@ -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
Expand All @@ -33,15 +33,15 @@ 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.3.0
django-markupfield==2.0.1

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
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions sponsors/tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions sponsors/tests/test_management_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
TieredBenefitConfiguration,
)
from sponsors.models.enums import AssetsRelatedTo
from sponsors.models.assets import TextAsset
from django.contrib.contenttypes.models import ContentType

from sponsors.management.commands.create_pycon_vouchers_for_sponsors import (
Expand Down Expand Up @@ -208,8 +209,9 @@ def test_reset_sponsorship_benefits_from_2025_to_2026(self):

# Create some GenericAssets with 2025 references
sponsorship_ct = ContentType.objects.get_for_model(sponsorship)
asset_2025 = baker.make(
"sponsors.TextAsset",
# Use TextAsset.objects.create() instead of baker.make() because
# model_bakery doesn't support GenericForeignKey fields
asset_2025 = TextAsset.objects.create(
content_type=sponsorship_ct,
object_id=sponsorship.id,
internal_name="conference_passes_code_2025",
Expand Down
2 changes: 1 addition & 1 deletion templates/sitetree/breadcrumbs.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load sitetree %}
{% if sitetree_items|length_is:"1" %}
{% if sitetree_items|length == 1 %}
{% else %}
<ul class="breadcrumbs menu">
{% for item in sitetree_items %}
Expand Down
Loading