Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ repos:
rev: "1.22.1"
hooks:
- id: django-upgrade
args: [--target-version, "4.2"]
args: [--target-version, "5.0"]
- repo: https://github.com/psf/black
rev: 24.10.0
hooks:
Expand Down
2 changes: 1 addition & 1 deletion blog/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class Entry(models.Model):
"publication date must be in the past."
),
)
content_format = models.CharField(choices=ContentFormat.choices, max_length=50)
content_format = models.CharField(choices=ContentFormat, max_length=50)
summary = models.TextField()
summary_html = models.TextField()
body = models.TextField()
Expand Down
2 changes: 2 additions & 0 deletions djangoproject/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,3 +306,5 @@
TRAC_URL = "https://code.djangoproject.com/"

DEFAULT_AUTO_FIELD = "django.db.models.AutoField"

FORMS_URLFIELD_ASSUME_HTTPS = True
4 changes: 2 additions & 2 deletions members/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ def test_status_filter(self):
StatusFilter(**filter_args).queryset(request=None, queryset=members),
[self.member],
)
filter_args["params"] = {"status": "inactive"}
filter_args["params"] = {"status": ["inactive"]}
self.assertCountEqual(
StatusFilter(**filter_args).queryset(None, CorporateMember.objects.all()),
[self.inactive_member],
)
filter_args["params"] = {"status": "all"}
filter_args["params"] = {"status": ["all"]}
self.assertCountEqual(
StatusFilter(**filter_args).queryset(None, CorporateMember.objects.all()),
[self.member, self.inactive_member],
Expand Down
2 changes: 1 addition & 1 deletion requirements/common.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ django-push @ git+https://github.com/brutasse/django-push.git@22fda99641cfbd2f30
django-read-only==1.18.0
django-recaptcha==4.0.0
django-registration-redux==2.13
Django==4.2.16
Django==5.0.9
docutils==0.21.2
feedparser==6.0.11
Jinja2==3.1.4
Expand Down