dj4.2

.github/workflows/test.yml

@@ -35,11 +35,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        django-version: [ "3.2", ]
+        django-version: [ "4.2", ]
         python-version: [ "3.11", ]
         experimental: [ false ]
 #        include:
-#          - django-version: "4.2"
+#          - django-version: "5.0"
 #            python-version: "3.11"
 #            experimental: true
     continue-on-error: ${{ matrix.experimental }}

pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "Pillow",
     "celery",
     "cryptography",
-    "django<4,>=3",
+    "django<5",
     "django-admin-extra-buttons",
     "django-admin-ordering",
     "django-admin-sync",

src/aurora/config/settings.py

@@ -118,11 +118,11 @@
 
 ROOT_URLCONF = "aurora.config.urls"
 
-# TEMPLATE_LOADERS = (
-#     "dbtemplates.loader.Loader",
-#     "django.template.loaders.filesystem.Loader",
-#     "django.template.loaders.app_directories.Loader",
-# )
+TEMPLATE_LOADERS = (
+    "dbtemplates.loader.Loader",
+    "django.template.loaders.filesystem.Loader",
+    "django.template.loaders.app_directories.Loader",
+)
 
 TEMPLATES = [
     {
@@ -138,11 +138,7 @@
         ],
         "APP_DIRS": False,
         "OPTIONS": {
-            "loaders": [
-                "dbtemplates.loader.Loader",
-                "django.template.loaders.filesystem.Loader",
-                "django.template.loaders.app_directories.Loader",
-            ],
+            "loaders": TEMPLATE_LOADERS,
             # 'builtins': [
             #     'http2.templatetags',
             # ],

src/aurora/core/templates/django/forms/table.html

@@ -11,7 +11,7 @@
 {% for field, errors in fields %}
   <tr{% with classes=field.css_classes %}{% if classes %} class="{{ classes }}"{% endif %}{% endwith %}><th>{% if field.label %}{{ field.label_tag }}{% endif %}</th>
     <td>
-        {% include "registration/_fieldset.html" %}
+        {% include "smart/_fieldset.html" %}
     </td>
   </tr>
 {% endfor %}

src/aurora/i18n/templatetags/itrans.py

@@ -45,11 +45,11 @@ def render(self, context):
         value = translator[current_locale][msgid]
 
         if self.asvar:
-            context[self.asvar] = value
+            context[self.asvar] = str(value)
             context[f"{self.asvar}_msgid"] = msgid
             return ""
         else:
-            return value
+            return str(value)
 
 
 class BlockTranslateNode(Node):
@@ -136,10 +136,10 @@ def render_value(key):
             with translation.override(None):
                 result = self.render(context, nested=True)
         if self.asvar:
-            context[self.asvar] = result
+            context[self.asvar] = str(result)
             return ""
         else:
-            return result
+            return str(result)
 
 
 @register.tag("translate")

tests/test_admin.py

@@ -175,10 +175,10 @@ def test_changeform(app, modeladmin, record):
     res = app.get(url)
     assert str(opts.app_config.verbose_name) in res.body.decode()
     if modeladmin.has_change_permission(Mock(user=app._user)):
-        res = res.form.submit()
+        res = res.forms[1].submit()
         assert res.status_code in [302, 200]
     # else:
-    #     res.form.submit(expect_errors=True)
+    #     res.forms[1].submit(expect_errors=True)
     #     assert res.status_code in [403]
 
 
@@ -191,7 +191,7 @@ def test_add(
     url = reverse(admin_urlname(modeladmin.model._meta, "add"))
     if modeladmin.has_add_permission(Mock(user=app._user)):
         res = app.get(url)
-        res.form.submit()
+        res.forms[1].submit()
         assert res.status_code in [200, 302]
     else:
         pytest.skip("No 'add' permission")
@@ -203,7 +203,7 @@ def test_delete(app, modeladmin, record, monkeypatch):
     url = reverse(admin_urlname(modeladmin.model._meta, "delete"), args=[record.pk])
     if modeladmin.has_delete_permission(Mock(user=app._user)):
         res = app.get(url)
-        res.form.submit()
+        res.forms[1].submit()
         assert res.status_code in [200, 302]
     else:
         pytest.skip("No 'delete' permission")

tests/test_i18n.py

@@ -42,7 +42,7 @@ def test_create_translation(django_app, simple_registration, admin_user):
     # assert url == f"/en-us/register/registration-1/{simple_registration.version}/"
     res = django_app.get(url, user=admin_user)
     # translation-form
-    res = res.form.submit()
+    res = res.forms[1].submit()
     # res = res.form.submit()
     # res.form["first_name"] = "first_name"
     # res.form["last_name"] = "f"

tests/test_panels.py

@@ -28,5 +28,5 @@ def test_panel(panel, django_app, admin_user):
 def test_panel_email(django_app, admin_user):
     url = reverse("admin:email")
     res = django_app.get(url, user=admin_user)
-    res = res.form.submit()
+    res = res.forms[1].submit()
     assert res.status_code == 200