From fe8c7fed912fb53d059cdca366582e13a8c09774 Mon Sep 17 00:00:00 2001 From: Andrew Aikman Date: Thu, 19 Sep 2024 17:12:25 +0100 Subject: [PATCH 1/5] Explore python, django-cms and django-filer version compatibility and test suite failures --- .github/workflows/test.yml | 12 +++++++++++- test_settings.py | 1 + tests/requirements/dj32_cms40.txt | 6 ++++++ tests/requirements/dj42_cms40.txt | 8 +++++++- tests/requirements/dj42_cms41.txt | 9 +++++++++ tests/requirements/requirements_base.txt | 5 ----- 6 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 tests/requirements/dj42_cms41.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9b28b89..c790b40 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,11 +16,21 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ 3.8, 3.9, '3.10' ] + python-version: [ 3.8, 3.9, '3.10' '3.11', '3.12'] requirements-file: [ dj32_cms40.txt, dj42_cms40.txt, + dj42_cms41.txt, ] + exclude: + # CMS 4.0 does not support python 3.11+ + - requirements-file: "dj32_cms40.txt" + python-version: ["3.11", "3.12"] + - requirements-file: "dj42_cms40.txt" + python-version: ["3.11", "3.12"] + # 3.8 is not required by django-cms 4.1+ + - requirements-file: "dj42_cms41.txt" + python-version: ["3.8"] steps: - uses: actions/checkout@v3 diff --git a/test_settings.py b/test_settings.py index a48a87c..2cdf609 100644 --- a/test_settings.py +++ b/test_settings.py @@ -91,6 +91,7 @@ 'FILE_UPLOAD_TEMP_DIR': mkdtemp(), 'FILER_CANONICAL_URL': 'test-path/', 'DEFAULT_AUTO_FIELD': 'django.db.models.AutoField', + 'CMS_CONFIRM_VERSION4': True, } diff --git a/tests/requirements/dj32_cms40.txt b/tests/requirements/dj32_cms40.txt index 0a44eca..d849fa2 100644 --- a/tests/requirements/dj32_cms40.txt +++ b/tests/requirements/dj32_cms40.txt @@ -1,3 +1,9 @@ -r ./requirements_base.txt Django>=3.2,<4.0 +django-filer==2.2.3 + +# Unreleased django-cms 4.0 compatible packages +https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms +https://github.com/django-cms/djangocms-versioning/tarball/support/django-cms-4.0.x#egg=djangocms-versioning +https://github.com/django-cms/djangocms-moderation/tarball/master#egg=djangocms-moderation diff --git a/tests/requirements/dj42_cms40.txt b/tests/requirements/dj42_cms40.txt index 086e31e..292c307 100644 --- a/tests/requirements/dj42_cms40.txt +++ b/tests/requirements/dj42_cms40.txt @@ -1,3 +1,9 @@ -r ./requirements_base.txt -Django>=4.2,<5.0 \ No newline at end of file +Django>=4.2,<5.0 +django-filer==2.2.3 + +# Unreleased django-cms 4.0 compatible packages +https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms +https://github.com/django-cms/djangocms-versioning/tarball/support/django-cms-4.0.x#egg=djangocms-versioning +https://github.com/django-cms/djangocms-moderation/tarball/master#egg=djangocms-moderation diff --git a/tests/requirements/dj42_cms41.txt b/tests/requirements/dj42_cms41.txt new file mode 100644 index 0000000..61cb307 --- /dev/null +++ b/tests/requirements/dj42_cms41.txt @@ -0,0 +1,9 @@ +-r ./requirements_base.txt + +Django>=4.2,<5.0 +django-cms==4.1.2 +djangocms-versioning +django-filer + +# Unreleased django-cms 4.0 compatible packages +https://github.com/django-cms/djangocms-moderation/tarball/master#egg=djangocms-moderation diff --git a/tests/requirements/requirements_base.txt b/tests/requirements/requirements_base.txt index c590c74..d381895 100644 --- a/tests/requirements/requirements_base.txt +++ b/tests/requirements/requirements_base.txt @@ -1,7 +1,6 @@ coverage django-app-helper django-classy-tags -django-filer==2.2.3 django-sekizai djangocms-audio djangocms-file @@ -13,7 +12,3 @@ isort mock -# Unreleased django-cms 4.0 compatible packages -https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms -https://github.com/django-cms/djangocms-versioning/tarball/support/django-cms-4.0.x#egg=djangocms-versioning -https://github.com/django-cms/djangocms-moderation/tarball/master#egg=djangocms-moderation From 036e99c428dca50f7b4389bc7aca231207cad0f9 Mon Sep 17 00:00:00 2001 From: Andrew Aikman Date: Thu, 19 Sep 2024 17:18:19 +0100 Subject: [PATCH 2/5] Trial removing the exclusion to trigger CI running the tests --- .github/workflows/test.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c790b40..307e705 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,15 +22,7 @@ jobs: dj42_cms40.txt, dj42_cms41.txt, ] - exclude: - # CMS 4.0 does not support python 3.11+ - - requirements-file: "dj32_cms40.txt" - python-version: ["3.11", "3.12"] - - requirements-file: "dj42_cms40.txt" - python-version: ["3.11", "3.12"] - # 3.8 is not required by django-cms 4.1+ - - requirements-file: "dj42_cms41.txt" - python-version: ["3.8"] + steps: - uses: actions/checkout@v3 From 8dd0cbfcf28c518b2c284eb4b012b862bf415191 Mon Sep 17 00:00:00 2001 From: Andrew Aikman Date: Thu, 19 Sep 2024 17:19:20 +0100 Subject: [PATCH 3/5] Fix missing quote in the CI test config --- .github/workflows/test.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 307e705..53f2acd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,13 +16,21 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ 3.8, 3.9, '3.10' '3.11', '3.12'] + python-version: [ 3.8, 3.9, '3.10', '3.11', '3.12'] requirements-file: [ dj32_cms40.txt, dj42_cms40.txt, dj42_cms41.txt, ] - + exclude: + # CMS 4.0 does not support python 3.11+ + - requirements-file: "dj32_cms40.txt" + python-version: ["3.11", "3.12"] + - requirements-file: "dj42_cms40.txt" + python-version: ["3.11", "3.12"] + # 3.8 is not required by django-cms 4.1+ + - requirements-file: "dj42_cms41.txt" + python-version: ["3.8"] steps: - uses: actions/checkout@v3 From 67838de7c075d62d991a33557e8ebf12ef7da24c Mon Sep 17 00:00:00 2001 From: Andrew Aikman Date: Thu, 19 Sep 2024 17:24:59 +0100 Subject: [PATCH 4/5] Rework the CI exclusion list to hopefully get it to work --- .github/workflows/test.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 53f2acd..557862e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,13 +24,17 @@ jobs: ] exclude: # CMS 4.0 does not support python 3.11+ - - requirements-file: "dj32_cms40.txt" - python-version: ["3.11", "3.12"] - - requirements-file: "dj42_cms40.txt" - python-version: ["3.11", "3.12"] + - requirements-file: 'dj32_cms40.txt' + python-version: '3.11' + - requirements-file: 'dj32_cms40.txt' + python-version: '3.12' + - requirements-file: 'dj42_cms40.txt' + python-version: '3.11' + - requirements-file: 'dj42_cms40.txt' + python-version: '3.12' # 3.8 is not required by django-cms 4.1+ - - requirements-file: "dj42_cms41.txt" - python-version: ["3.8"] + - requirements-file: 'dj42_cms41.txt' + python-version: '3.8' steps: - uses: actions/checkout@v3 From 4ffc97fafde1be7909b0823ebda133d612838d0d Mon Sep 17 00:00:00 2001 From: Andrew Aikman Date: Thu, 19 Sep 2024 17:38:08 +0100 Subject: [PATCH 5/5] Remove django-mppt --- test_settings.py | 1 - tests/requirements/dj42_cms41.txt | 2 +- tests/requirements/requirements_base.txt | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/test_settings.py b/test_settings.py index 2cdf609..4c33a14 100644 --- a/test_settings.py +++ b/test_settings.py @@ -15,7 +15,6 @@ 'TIME_ZONE': 'Europe/Zurich', 'INSTALLED_APPS': [ 'easy_thumbnails', - 'mptt', 'djangocms_versioning_filer', 'filer', 'djangocms_versioning', diff --git a/tests/requirements/dj42_cms41.txt b/tests/requirements/dj42_cms41.txt index 61cb307..ac8dbd5 100644 --- a/tests/requirements/dj42_cms41.txt +++ b/tests/requirements/dj42_cms41.txt @@ -1,7 +1,7 @@ -r ./requirements_base.txt Django>=4.2,<5.0 -django-cms==4.1.2 +django-cms==4.1.1 djangocms-versioning django-filer diff --git a/tests/requirements/requirements_base.txt b/tests/requirements/requirements_base.txt index d381895..44d8820 100644 --- a/tests/requirements/requirements_base.txt +++ b/tests/requirements/requirements_base.txt @@ -10,5 +10,3 @@ factory-boy flake8 isort mock - -