Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: django-cms 4.1 Compatibility POC #113

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
'TIME_ZONE': 'Europe/Zurich',
'INSTALLED_APPS': [
'easy_thumbnails',
'mptt',
'djangocms_versioning_filer',
'filer',
'djangocms_versioning',
Expand Down Expand Up @@ -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,
}


Expand Down
6 changes: 6 additions & 0 deletions tests/requirements/dj32_cms40.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 7 additions & 1 deletion tests/requirements/dj42_cms40.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
-r ./requirements_base.txt

Django>=4.2,<5.0
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
9 changes: 9 additions & 0 deletions tests/requirements/dj42_cms41.txt
Original file line number Diff line number Diff line change
@@ -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
7 changes: 0 additions & 7 deletions tests/requirements/requirements_base.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
coverage
django-app-helper
django-classy-tags
django-filer==2.2.3
django-sekizai
djangocms-audio
djangocms-file
Expand All @@ -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
Loading