Skip to content

Commit e7744d1

Browse files
authored
feat: Django 4.2, Django CMS 4.1.0rc2 compatibility, and version locking (#326)
* Support GrouperModelAdmin of 4.1.0rc2 * Fix linter issues * add debug print * Fix tests * add Django 4.2 * remove debug print function * get test versions right * Make naming more consistent. * Update docs * fix: allow multiple field modifiers per model * Keep language when previewing * Add compiled de and nl messages * Update readme * fix cross styling * Use action buttons of the django CMS core * fix lint errors * Fix #325 * Fix isort, remove unnecessary changes * Fix cms_config.py * Fix grouper selector form * fix isort issue in tests * Fix tests * test fix * Fix tests * ... and flake8 again * fix: Compatibility shim for djangocms-version-locking's monkey patches * feat: Version locking * fix: add migration * Add lock indicator to toolbar * Add first tests, some fixes * Add more tests. * Add messages * add some type hints * extend coverage * Add tests for indicator unlock entry * fix isort * fix inaccurate tests, copy docs stub * Add ruff * Fix lint action * and again * fix back * fix: workaround for 4.1rc2 styling bug * Add compiled messages * Add compatibility shim for djangocms_moderations * Fix ruff error * Merge migration tree * Add deprecation warning for moderation compatibility shim
1 parent 2ce8647 commit e7744d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3051
-1256
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ jobs:
2222
python -m pip install --upgrade pip
2323
pip install ruff
2424
- name: Run Ruff
25-
run: ruff djangocms_versioning
25+
run: |
26+
ruff djangocms_versioning tests

.github/workflows/test.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
python-version: [ 3.8, 3.9, "3.10", "3.11" ] # latest release minus two
15+
python-version: [ 3.9, "3.10", "3.11" ] # latest release minus two
1616
requirements-file: [
1717
dj32_cms41.txt,
1818
dj40_cms41.txt,
1919
dj41_cms41.txt,
20+
dj42_cms41.txt,
2021
]
2122

2223
steps:
@@ -43,11 +44,12 @@ jobs:
4344
strategy:
4445
fail-fast: false
4546
matrix:
46-
python-version: [ 3.8, 3.9, "3.10", "3.11" ] # latest release minus two
47+
python-version: [ 3.9, "3.10", "3.11" ] # latest release minus two
4748
requirements-file: [
4849
dj32_cms41.txt,
4950
dj40_cms41.txt,
5051
dj41_cms41.txt,
52+
dj42_cms41.txt,
5153
]
5254

5355
services:
@@ -88,16 +90,17 @@ jobs:
8890
strategy:
8991
fail-fast: false
9092
matrix:
91-
python-version: [ 3.8, 3.9, "3.10", "3.11" ] # latest release minus two
93+
python-version: [ 3.9, "3.10", "3.11" ] # latest release minus two
9294
requirements-file: [
9395
dj32_cms41.txt,
9496
dj40_cms41.txt,
9597
dj41_cms41.txt,
98+
dj42_cms41.txt,
9699
]
97100

98101
services:
99102
mysql:
100-
image: mysql:5.7
103+
image: mysql:8.0
101104
env:
102105
MYSQL_ALLOW_EMPTY_PASSWORD: yes
103106
MYSQL_DATABASE: djangocms_test

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
16

README.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
|django| |djangocms4|
2+
13
*********************
24
django CMS Versioning
35
*********************
@@ -99,3 +101,9 @@ To update transifex translation in this repo you need to download the
99101
`transifex cli <https://developers.transifex.com/docs/cli>`_ and run
100102
``tx pull`` from the repo's root directory. After downloading the translations
101103
do not forget to run the ``compilemessages`` management command.
104+
105+
106+
.. |django| image:: https://img.shields.io/badge/django-3.2%2B-blue.svg
107+
:target: https://www.djangoproject.com/
108+
.. |djangocms4| image:: https://img.shields.io/badge/django%20CMS-4.1-blue.svg
109+
:target: https://www.django-cms.org/

djangocms_versioning/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
__version__ = "1.2.2"
2-
3-
default_app_config = "djangocms_versioning.apps.VersioningConfig"

0 commit comments

Comments
 (0)