Merge branch 'django-cms:master' into master

Author: fsbraun

.github/workflows/docs.yml

@@ -19,7 +19,7 @@ jobs:
           python-version: '3.11'
           cache: 'pip'
       - name: Cache dependencies
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.in') }}
@@ -44,7 +44,7 @@ jobs:
           python-version: '3.11'
           cache: 'pip'
       - name: Cache dependencies
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('docs/requirements.in') }}

setup.py

@@ -9,7 +9,6 @@
     "django-filer>=1.7",
     "easy-thumbnails",
     "djangocms-attributes-field>=1",
-    "djangocms-text-ckeditor>=3.1.0",
     "django-entangled>=0.5.4",
 ]
 
@@ -25,9 +24,11 @@
         "django-parler",
         "djangocms-versioning>=2.0.0",
         "djangocms-alias>=2.0.0",
+        "djangocms-text",
     ],
     "cms-3": [
         "django-cms<4",
+        "djangocms-text-ckeditor>=3.1.0",
         "django-parler",
     ],
 }