Merge remote-tracking branch 'dCA/master' into feature/issue-648-unab…

…le-to-unlink
django-cms · Sep 20, 2023 · 4802bdf · 4802bdf
2 parents 0df1291 + 10de493
commit 4802bdf
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -16,8 +16,6 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - name: Install gulp
       run: npm install -g [email protected]
-    - name: Install npm
-      run: npm install --location=global npm@latest
     - name: Install dependencies
       run: npm install
     # - name: Run gulp

diff --git a/tests/requirements/dj22_cms37.txt b/tests/requirements/dj22_cms37.txt
@@ -1,4 +1,6 @@
 -r base.txt
+django-mptt
+django-treebeard<4.5
 
 Django>=2.2,<3.0
 django-cms>=3.7,<3.8
diff --git a/tests/requirements/dj22_cms38.txt b/tests/requirements/dj22_cms38.txt
@@ -1,4 +1,6 @@
 -r base.txt
+django-mptt
+django-treebeard<4.5
 
 Django>=2.2,<3.0
 django-cms>=3.8,<3.9
diff --git a/tests/requirements/dj22_cms40.txt b/tests/requirements/dj22_cms40.txt
@@ -1,4 +1,6 @@
 -r base.txt
+django-mptt
+django-treebeard<4.5
 
 Django>=2.2,<2.3
 git+https://github.com/django-cms/django-cms@release/4.0.x#egg=django-cms
diff --git a/tests/requirements/dj31_cms38.txt b/tests/requirements/dj31_cms38.txt
@@ -1,4 +1,5 @@
 -r base.txt
+django-mptt
 
 Django>=3.1,<3.2
 django-cms>=3.8,<3.9
diff --git a/tests/settings.py b/tests/settings.py
@@ -30,7 +30,6 @@ def __getitem__(self, item):
     'INSTALLED_APPS': [
         'easy_thumbnails',
         'filer',
-        'mptt',
         'djangocms_picture',
         'djangocms_link',
         'djangocms_text_ckeditor',