diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d0b06e2b7..627eb644c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,8 @@ jobs: dj22_cms37.txt, dj22_cms38.txt, dj31_cms38.txt, - dj32_cms39.txt + dj32_cms39.txt, + dj32_cms310.txt ] os: [ ubuntu-20.04, diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bf2c32515..01f8f3dfb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,14 +2,31 @@ Changelog ========= -Unreleased -========== - -* Add dark mode feature and dark mode patch for skin moono-lisa -* Added support for Django 3.2 -* Drop support for python 3.5, 3.6 and django 3.0 -* Added pre-commit hooks for developer workflow to ensure code quality +5.0.0 (2022-03-22) +================== +* Drop support for Python 3.5 and 3.6 +* Drop support for django 3.0 +* Added support for Python 3.9 and 3.10 +* Added support for django 3.2 +* Added support for django-cms 3.9 and 3.10 + +New features +------------ +* Upgrade ckeditor to 4.17.2 in `595 `_ +* Dark mode support for standard editor UI (a.k.a. "skin") moono-lisa in `592 `_ +* Basic dark mode compatibility and fix for source edit bug in `590 `_ + +Fixes and other changes +----------------------- +* Copying plugins inside ckeditor creates a child plugin copy in `569 `_ +* 504 copy paste plugins inside ckeditor refer to same instance in `572 `_ +* Use assertEqual instead of assertEquals for Python 3.11 compatibility in `580 `_ +* fix breaking tests in `585 `_ +* Update Node.js to version 16 LTS and Gulpfile upgrade as well in `593 `_ +* Replace ``force_text`` with ``force_str`` in `546 `_ +* Fix django 3.2 tests, pypi release actions and pre-commit in `594 `_ +* Remove excessive spaces (`#531 `_) in `597 `_ 4.0.0 (2020-09-15) ================== diff --git a/djangocms_text_ckeditor/__init__.py b/djangocms_text_ckeditor/__init__.py index 40cb87428..60bb2ae23 100644 --- a/djangocms_text_ckeditor/__init__.py +++ b/djangocms_text_ckeditor/__init__.py @@ -10,12 +10,11 @@ 4. git add djangocms_text_ckeditor/__init__.py CHANGELOG.rst setup.py 5. git commit -m 'Bump to {new version}' 6. git push - 7. Assure that all tests pass on https://travis-ci.org/github/divio/djangocms-text-ckeditor. - 8. git tag {new_version_number} - 9. git push --tags -10. python setup.py sdist -11. twine upload dist/djangocms-text-ckeditor-{new_version_number}.tar.gz + 7. Assure that all tests pass on https://github.com/django-cms/djangocms-text-ckeditor/actions + 8. Create a new release on https://github.com/django-cms/djangocms-text-ckeditor/releases/new + 9. Publish the release when ready +10. Github actions will publish the new package to pypi """ -__version__ = '4.0.0' +__version__ = '5.0.0' default_app_config = 'djangocms_text_ckeditor.apps.TextCkeditorConfig' diff --git a/setup.py b/setup.py index 055d1a15b..dbdc4844e 100644 --- a/setup.py +++ b/setup.py @@ -34,6 +34,7 @@ 'Framework :: Django CMS :: 3.7', 'Framework :: Django CMS :: 3.8', 'Framework :: Django CMS :: 3.9', + 'Framework :: Django CMS :: 3.10', 'Topic :: Internet :: WWW/HTTP', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Software Development', diff --git a/tests/requirements/dj32_cms310.txt b/tests/requirements/dj32_cms310.txt new file mode 100644 index 000000000..8d5d93d87 --- /dev/null +++ b/tests/requirements/dj32_cms310.txt @@ -0,0 +1,4 @@ +-r base.txt + +Django>=3.2,<3.3 +django-cms>=3.10.0rc2,<4.0 diff --git a/tox.ini b/tox.ini index adb9950ad..6c17d5522 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = frontend py{37,38}-dj{22}-cms{37,38} py{37,38}-dj{31}-cms{38,39} - py{38,39,310}-dj{32}-cms{39} + py{38,39,310}-dj{32}-cms{39,310} skip_missing_interpreters=True @@ -18,6 +18,7 @@ deps = cms37: django-cms>=3.7,<3.8 cms38: django-cms>=3.8,<3.9 cms39: django-cms>=3.9,<3.10 + cms310: django-cms>=3.10.0rc2 commands = {envpython} --version {env:COMMAND:coverage} erase