Merge branch 'main' into add-tests-for-fundraising-webhook

Author: ontowhee

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
           - id: pyupgrade
             args: [--py312]
     - repo: https://github.com/adamchainz/django-upgrade
-      rev: "1.22.1"
+      rev: "1.22.2"
       hooks:
           - id: django-upgrade
             args: [--target-version, "5.0"]
@@ -42,7 +42,7 @@ repos:
           - id: black
             exclude: '(\/migrations\/)'
     - repo: https://github.com/rbubley/mirrors-prettier
-      rev: "v3.3.3"
+      rev: "v3.4.1"
       hooks:
           - id: prettier
             exclude_types: [html, json, scss]

aggregator/migrations/0006_localdjangocommunity_plural.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.0.9 on 2024-11-21 06:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aggregator', '0005_feeditem_add_index_date_modified'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='localdjangocommunity',
+            options={'verbose_name_plural': 'Local Django Communities'},
+        ),
+    ]

aggregator/models.py

@@ -226,6 +226,7 @@ class LocalDjangoCommunity(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
 
     class Meta:
+        verbose_name_plural = _("Local Django Communities")
         constraints = [
             models.CheckConstraint(
                 check=(

blog/tests.py

@@ -1,5 +1,6 @@
+from contextlib import redirect_stderr
 from datetime import timedelta
-from test.support import captured_stderr
+from io import StringIO
 
 from django.test import TestCase
 from django.urls import reverse
@@ -64,7 +65,7 @@ def test_docutils_safe(self):
         """
         Make sure docutils' file inclusion directives are disabled by default.
         """
-        with captured_stderr() as self.docutils_stderr:
+        with redirect_stderr(StringIO()):
             entry = Entry.objects.create(
                 pub_date=self.now,
                 is_active=True,