Merge branch 'master' into dependabot/github_actions/actions/checkout-4

.github/workflows/test.yml

@@ -75,3 +75,34 @@ jobs:
         with:
           name: html-report
           path: htmlcov
+
+  unit-tests-django-main:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.11']
+        requirements-file: [
+          'py311-djmain-cms41-default.txt',
+          'py311-djmain-cms41-versioning.txt',
+        ]
+        os: [
+          ubuntu-20.04,
+        ]
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python ${{ matrix.python-version }}
+
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r tests/requirements/${{ matrix.requirements-file }}
+        python setup.py install
+
+    - name: Run coverage
+      run: coverage run setup.py test
+      continue-on-error: true

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ ci:
 
 repos:
   -  repo: https://github.com/asottile/pyupgrade
-     rev: v3.14.0
+     rev: v3.15.0
      hooks:
        -  id: pyupgrade
           args: ["--py38-plus"]

djangocms_alias/templatetags/djangocms_alias_tags.py

@@ -176,6 +176,7 @@ def render_tag(self, context, static_code, extra_bits, nodelist=None):
                 placeholder=placeholder,
                 context=context,
                 nodelist=nodelist,
+                use_cache=True,
             )
             return content
         return ''