diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9b28b89..557862e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,11 +16,25 @@ 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' + - 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' steps: - uses: actions/checkout@v3 diff --git a/test_settings.py b/test_settings.py index a48a87c..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', @@ -91,6 +90,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..ac8dbd5 --- /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.1 +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..44d8820 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 @@ -11,9 +10,3 @@ factory-boy flake8 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