Skip to content

Commit

Permalink
Drop support for Django 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
claudep committed May 13, 2023
1 parent a3a14ce commit 8c16b57
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 20 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Expand Up @@ -11,16 +11,14 @@ 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
- python-version: 3.7
django-version: 4.1
- python-version: 3.7
django-version: main
- python-version: 3.10
django-version: 2.2

steps:
- uses: actions/checkout@v3
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Expand Up @@ -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)
==================

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -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.

Expand Down
8 changes: 3 additions & 5 deletions docs/installation.rst
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion setup.py
Expand Up @@ -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",
Expand Down
10 changes: 4 additions & 6 deletions 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
Expand Down Expand Up @@ -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'<script {js_type}src="/tinymce/compressor/"></script>',
f'<script {js_type}src="/static/django_tinymce/init_tinymce.js"></script>',
'<script src="/tinymce/compressor/"></script>',
'<script src="/static/django_tinymce/init_tinymce.js"></script>',
],
)
self.assertEqual(list(widget.media.render_css()), [])
Expand All @@ -138,8 +136,8 @@ def test_tinymce_widget_media(self):
self.assertEqual(
widget.media.render_js(),
[
f'<script {js_type}src="/static/tinymce/tinymce.min.js"></script>',
f'<script {js_type}src="/static/django_tinymce/init_tinymce.js"></script>',
'<script src="/static/tinymce/tinymce.min.js"></script>',
'<script src="/static/django_tinymce/init_tinymce.js"></script>',
],
)

Expand Down
4 changes: 0 additions & 4 deletions 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
Expand Down Expand Up @@ -42,7 +39,6 @@ python =

[gh-actions:env]
DJANGO =
2.2: dj22
3.2: dj32
4.0: dj40
4.1: dj41
Expand Down

0 comments on commit 8c16b57

Please sign in to comment.