Merge branch 'main' into djangocms-frontend/docs-328

Author: fsbraun

.github/workflows/codecov.yml

@@ -16,33 +16,41 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]  # latest release minus two
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]  # latest release minus two
         requirements-file: [
             dj42_cms311.txt,
             dj42_cms41.txt,
             dj50_cms41.txt,
             dj51_cms41.txt,
             dj52_cms50.txt,
+            dj60_cms50.txt,
         ]
         os: [
             ubuntu-latest,
         ]
         exclude:
-          - python-version: "3.9"
+          # Python 3.14 only works with Django 5.2+
+          - python-version: "3.14"
+            requirements-file: dj42_cms311.txt
+          - python-version: "3.14"
+            requirements-file: dj42_cms41.txt
+          - python-version: "3.14"
             requirements-file: dj50_cms41.txt
-          - python-version: "3.9"
+          - python-version: "3.14"
             requirements-file: dj51_cms41.txt
-          - python-version: "3.9"
-            requirements-file: dj52_cms50.txt
+          # Python 3.10 and 3.11 only supported until Django 5.2
           - python-version: "3.10"
-            requirements-file: dj52_cms50.txt
+            requirements-file: dj60_cms50.txt
+          - python-version: "3.11"
+            requirements-file: dj60_cms50.txt
+          # Python 3.12 and 3.13 don't support Django 4.2 with CMS 3.11
           - python-version: "3.12"
             requirements-file: dj42_cms311.txt
           - python-version: "3.13"
             requirements-file: dj42_cms311.txt
 
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: '2'
 
@@ -53,7 +61,8 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt install libcairo2-dev pkg-config python3-dev
-        pip install -U -r tests/requirements/${{ matrix.requirements-file }}
+        python -m pip install --upgrade pip uv
+        uv pip install --system -r tests/requirements/${{ matrix.requirements-file }}
     - name: Run coverage
       run: |
         coverage run -m pytest

.github/workflows/codeql.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/docs.yml

@@ -12,7 +12,7 @@ jobs:
     name: build
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
@@ -37,7 +37,7 @@ jobs:
     needs: build
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

.github/workflows/publish-to-live-pypi.yml

@@ -15,7 +15,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python 3.12
       uses: actions/setup-python@v6
       with:

.github/workflows/publish-to-test-pypi.yml

@@ -15,7 +15,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - name: Set up Python 3.10
       uses: actions/setup-python@v6
       with:

.pre-commit-config.yaml

@@ -9,13 +9,13 @@ ci:
 
 repos:
     - repo: https://github.com/asottile/pyupgrade
-      rev: v3.20.0
+      rev: v3.21.0
       hooks:
           - id: pyupgrade
-            args: ["--py39-plus"]
+            args: ["--py310-plus"]
 
     - repo: https://github.com/adamchainz/django-upgrade
-      rev: "1.29.0"
+      rev: "1.29.1"
       hooks:
           - id: django-upgrade
             args: [--target-version, "4.2"]
@@ -33,6 +33,6 @@ repos:
                 - flake8-logging-format
 
     - repo: https://github.com/tox-dev/pyproject-fmt
-      rev: v2.7.0
+      rev: v2.11.0
       hooks:
       - id: pyproject-fmt

djangocms_frontend/component_base.py

@@ -1,5 +1,4 @@
 import importlib
-import typing
 
 from django import forms
 from django.apps import apps
@@ -63,6 +62,7 @@ class CMSFrontendComponent(forms.Form):
         "link_fieldset_position",
         "require_parent",
         "parent_classes",
+        "allowed_models",
     ]
 
     @classmethod
@@ -212,11 +212,11 @@ def get_registration(cls) -> tuple[type, type, list[type]]:
         )
 
     @classproperty
-    def _component_meta(cls) -> typing.Optional[type]:
+    def _component_meta(cls) -> type | None:
         return getattr(cls, "Meta", None)
 
     @classmethod
-    def _generate_fieldset(cls) -> list[tuple[typing.Optional[str], dict]]:
+    def _generate_fieldset(cls) -> list[tuple[str | None, dict]]:
         return [(None, {"fields": cls.declared_fields.keys()})]
 
     def get_short_description(self) -> str:

djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse-container.html

@@ -2,7 +2,7 @@
 <{{ instance.tag_type }}{{ instance.get_attributes }}
     id="{{ instance.container_identifier }}"
     role="tabpanel"
-    data-bs-parent="#{{ parent.uuid }}"
+    data-bs-parent="#collapse-{{ parent.uuid }}"
     aria-labelledby="trigger-{{ instance.container_identifier }}">
     {% for plugin in instance.child_plugin_instances %}
         {% with forloop as parentloop %}{% render_plugin plugin %}{% endwith %}

djangocms_frontend/contrib/collapse/templates/djangocms_frontend/bootstrap5/collapse.html

@@ -1,6 +1,6 @@
 {% load cms_tags frontend %}
 <{{ instance.tag_type }}{{ instance.get_attributes }}
-id="{{ instance.uuid }}"
+id="collapse-{{ instance.uuid }}"
 data-bs-children="{{ instance.collapse_siblings }}"
 role="tablist"
 >

djangocms_frontend/contrib/image/cms_plugins.py

@@ -65,17 +65,16 @@ class ImagePlugin(
                 "classes": ("collapse",),
                 "fields": (
                     "use_responsive_image",
-                    ("width", "height"),
                     "alignment",
                 ),
             },
         ),
         (
-            _("Cropping"),
+            _("Sizing"),
             {
                 "classes": ("collapse",),
                 "fields": (
-                    ("use_automatic_scaling", "use_no_cropping"),
+                    ("width", "height"),
                     ("use_crop", "use_upscale"),
                     "thumbnail_options",
                 ),