diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 1556b707..fc3ae279 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -16,11 +16,9 @@ jobs: strategy: matrix: django_version: - - '3.2' - - '4.0' - - '4.1' - '4.2' - '5.0' + - '5.1' python_version: - '3.8' - '3.9' @@ -35,23 +33,14 @@ jobs: - django_version: '5.0' python_version: '3.9' - - django_version: '3.2' - python_version: '3.11' - - - django_version: '4.0' - python_version: '3.11' - - - django_version: '3.2' - python_version: '3.12' - - - django_version: '4.0' - python_version: '3.12' + - django_version: '5.1' + python_version: '3.8' - - django_version: '4.1' - python_version: '3.12' + - django_version: '5.1' + python_version: '3.9' include: - - django_version: '3.2' + - django_version: '4.2' python_version: '3.8' database: 'sqlite' env: diff --git a/CHANGES b/CHANGES index 5059e69a..4b342944 100644 --- a/CHANGES +++ b/CHANGES @@ -2,11 +2,13 @@ CHANGELOG ========= -0.30.2 (unreleased) +0.31.0 (unreleased) ------------------- - Fix icon control. - Fix JS error if with-forms does not exists #379 #380 +- Support Django 5.1. +- Drop support for Django < 4.2. 0.30.1 (2024-06-17) ------------------- diff --git a/leaflet/__init__.py b/leaflet/__init__.py index 87e517cf..d1f2f303 100644 --- a/leaflet/__init__.py +++ b/leaflet/__init__.py @@ -1,7 +1,6 @@ from collections import OrderedDict from urllib.parse import urlparse -import django from django.conf import settings from django.core.exceptions import ImproperlyConfigured from django.templatetags.static import static @@ -174,7 +173,3 @@ def _normalize_plugins_config(): PLUGINS[PLUGIN_ALL].setdefault(resource_type, []).extend(urls) PLUGINS['__is_normalized__'] = True - - -if django.VERSION < (3, 2): - default_app_config = 'leaflet.apps.LeafletConfig' diff --git a/leaflet/tests/tests.py b/leaflet/tests/tests.py index c231942a..e586101b 100644 --- a/leaflet/tests/tests.py +++ b/leaflet/tests/tests.py @@ -309,12 +309,11 @@ def test_widget_template_overriden(self): widget = self.formfield.widget output = widget.render('geom', '', {'id': 'geom'}) self.assertIn('