diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 78e2294c..754646e2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: max-parallel: 5 matrix: python-version: ['3.7', '3.8', '3.9', '3.10'] - django-version: ['2.2', '3.2', '4.0', '4.1', 'main'] + django-version: ['3.2', '4.0', '4.1', 'main'] exclude: - python-version: 3.7 django-version: 4.0 @@ -19,8 +19,6 @@ jobs: django-version: 4.1 - python-version: 3.7 django-version: main - - python-version: 3.10 - django-version: 2.2 steps: - uses: actions/checkout@v3 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b5fb278c..b41d4e6d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,11 @@ Changelog This document describes changes between each past release. +Unreleased +========== + +- Drop support for Django 2.2. + 3.6.1 (2023-03-20) ================== diff --git a/README.rst b/README.rst index 1160b052..dbd053e4 100644 --- a/README.rst +++ b/README.rst @@ -71,7 +71,7 @@ In your code: Releases ======== -Latest release is 3.6.1. It supports Python 3.7+ and Django 2.2 to 4.1. +Latest release is 3.6.1. It supports Python 3.7+ and Django 3.2 to 4.1. Using TinyMCE 5.10.7. diff --git a/docs/installation.rst b/docs/installation.rst index ce5a5e09..e9d04508 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -11,11 +11,9 @@ project. Prerequisites ------------- -The django-tinymce application requires `Django`_ version 1.0 or higher. You will also -need `TinyMCE`_ version 3.0.1 or higher and a `language pack`_ for *every -language* you enabled in ``settings.LANGUAGES``. If you use the `django-filebrowser`_ -application in your project, the tinymce application can use it as a browser -when including media. +The django-tinymce application requires a supported `Django`_ version. +If you use the `django-filebrowser`_ application in your project, the tinymce +application can use it as a browser when including media. If you want to use the `spellchecker plugin`_ using the supplied view (no PHP needed) you must install the `PyEnchant`_ package and dictionaries for your diff --git a/setup.py b/setup.py index 427a73ac..ae249382 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,6 @@ def read_file(filename): "Development Status :: 5 - Production/Stable", "Environment :: Web Environment", "Framework :: Django", - "Framework :: Django :: 2.2", "Framework :: Django :: 3.2", "Framework :: Django :: 4.0", "Framework :: Django :: 4.1", diff --git a/tests/test_widgets.py b/tests/test_widgets.py index bd4bdd68..ee1f2178 100644 --- a/tests/test_widgets.py +++ b/tests/test_widgets.py @@ -1,7 +1,6 @@ from contextlib import contextmanager from unittest.mock import patch -import django from django import forms from django.test import SimpleTestCase from django.test.utils import override_settings @@ -124,12 +123,11 @@ def test_tinymce_widget_size(self): def test_tinymce_widget_media(self): widget = TinyMCE() - js_type = 'type="text/javascript" ' if django.get_version() < "3.1" else "" self.assertEqual( widget.media.render_js(), [ - f'', - f'', + '', + '', ], ) self.assertEqual(list(widget.media.render_css()), []) @@ -138,8 +136,8 @@ def test_tinymce_widget_media(self): self.assertEqual( widget.media.render_js(), [ - f'', - f'', + '', + '', ], ) diff --git a/tox.ini b/tox.ini index f0c9aa26..9ab764bf 100644 --- a/tox.ini +++ b/tox.ini @@ -1,14 +1,11 @@ [tox] envlist = - py{37,38,39}-dj22 py{37,38,39,310}-dj32 py{38,39,310}-dj{40,41,main} flake8 [testenv] deps = - dj22: Django>=2.2,<3.0 - dj31: Django>=3.1,<3.2 dj32: Django>=3.2,<4.0 dj40: Django>=4.0,<4.1 dj41: Django>=4.1,<4.2 @@ -42,7 +39,6 @@ python = [gh-actions:env] DJANGO = - 2.2: dj22 3.2: dj32 4.0: dj40 4.1: dj41