From d3515b0ce3685cd27803a042821597ac1ab9d65b Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:38:25 +0200 Subject: [PATCH 01/10] fix django 2.2 tests --- tests/requirements/dj22_cms37.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements/dj22_cms37.txt b/tests/requirements/dj22_cms37.txt index 6b96a1021..ec412fb96 100644 --- a/tests/requirements/dj22_cms37.txt +++ b/tests/requirements/dj22_cms37.txt @@ -1,4 +1,4 @@ -r base.txt - +django-mptt Django>=2.2,<3.0 django-cms>=3.7,<3.8 From 8bede059521879a8e27c18a07bee18f9bade6ce3 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:41:37 +0200 Subject: [PATCH 02/10] Update dj22_cms37.txt --- tests/requirements/dj22_cms37.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/requirements/dj22_cms37.txt b/tests/requirements/dj22_cms37.txt index ec412fb96..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 From 9afe7bdbf478023a69d851a854f7d06d2cf8512c Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:41:45 +0200 Subject: [PATCH 03/10] Update dj22_cms38.txt --- tests/requirements/dj22_cms38.txt | 2 ++ 1 file changed, 2 insertions(+) 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 From 8b678b980276b78cb763755c86436a9dae699def Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:41:56 +0200 Subject: [PATCH 04/10] Update dj22_cms40.txt --- tests/requirements/dj22_cms40.txt | 2 ++ 1 file changed, 2 insertions(+) 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 From f1d36657d062376a428d7cae3c9b8c47009c0574 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:42:14 +0200 Subject: [PATCH 05/10] Update dj31_cms38.txt --- tests/requirements/dj31_cms38.txt | 1 + 1 file changed, 1 insertion(+) 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 From f4d092a98b7d35424021f4a825006176ce6445c4 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:47:55 +0200 Subject: [PATCH 06/10] Update settings.py --- tests/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/settings.py b/tests/settings.py index 314dec46e..71bc4216d 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -4,6 +4,7 @@ from tempfile import mkdtemp from cms import __version__ +from filer import __version__ as filer_version port = 8000 @@ -30,7 +31,6 @@ def __getitem__(self, item): 'INSTALLED_APPS': [ 'easy_thumbnails', 'filer', - 'mptt', 'djangocms_picture', 'djangocms_link', 'djangocms_text_ckeditor', From 8d65202eb7961ef6eae77127ac082030efa844f0 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:49:53 +0200 Subject: [PATCH 07/10] Update settings.py --- tests/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/settings.py b/tests/settings.py index 71bc4216d..acac67123 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -4,7 +4,6 @@ from tempfile import mkdtemp from cms import __version__ -from filer import __version__ as filer_version port = 8000 From 1b98a8d078a9ef9a4eb48fa908ee964e04385447 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:51:57 +0200 Subject: [PATCH 08/10] Update frontend.yml --- .github/workflows/frontend.yml | 2 -- 1 file changed, 2 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 From 6b6034f3fec813ac6efcd57365550a18366ad378 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:53:36 +0200 Subject: [PATCH 09/10] Enable frontend tests --- .github/workflows/frontend.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index a6a908323..4857b9fe4 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -18,5 +18,5 @@ jobs: run: npm install -g gulp@4.0.2 - name: Install dependencies run: npm install - # - name: Run gulp - # run: gulp ci + - name: Run gulp + run: gulp ci From 79a459fafd2b3ade7aa02500b24219c4dde30504 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Wed, 20 Sep 2023 16:54:48 +0200 Subject: [PATCH 10/10] Update frontend.yml --- .github/workflows/frontend.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 4857b9fe4..a6a908323 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -18,5 +18,5 @@ jobs: run: npm install -g gulp@4.0.2 - name: Install dependencies run: npm install - - name: Run gulp - run: gulp ci + # - name: Run gulp + # run: gulp ci