From 10de493a1bab5ea3edef8c8d080e85f8406deeed Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:57:37 +0200 Subject: [PATCH] fix: test suite for Django 2.2 (#650) * fix django 2.2 tests * Update dj22_cms37.txt * Update dj22_cms38.txt * Update dj22_cms40.txt * Update dj31_cms38.txt * Update settings.py * Update frontend.yml * Enable frontend tests --- .github/workflows/frontend.yml | 2 -- tests/requirements/dj22_cms37.txt | 2 ++ tests/requirements/dj22_cms38.txt | 2 ++ tests/requirements/dj22_cms40.txt | 2 ++ tests/requirements/dj31_cms38.txt | 1 + tests/settings.py | 1 - 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index e35a840d3..a6a908323 100644 --- 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 gulp@4.0.2 - - 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 index 6b96a1021..43bb6035f 100644 --- 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 index 22c4fef29..d4ef4b714 100644 --- 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 index a6bc05299..da3a056b0 100644 --- 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 index d17fdb422..c7905e52b 100644 --- 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 index 314dec46e..acac67123 100644 --- 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',