Drop Django 2.2 support

radiac · Aug 11, 2024 · d965ec6 · d965ec6
1 parent 365cb72
commit d965ec6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,8 +16,6 @@ jobs:
       matrix:
         include:
           # Django LTS on latest supported Python
-          - python: "3.10"
-            django: "2.2"
           - python: "3.10"
             django: "3.2"
           - python: "3.12"
@@ -53,8 +51,6 @@ jobs:
       matrix:
         include:
           # Django LTS on latest supported Python
-          - python: "3.10"
-            django: "2.2"
           - python: "3.10"
             django: "3.2"
           - python: "3.12"
@@ -103,8 +99,6 @@ jobs:
       matrix:
         include:
           # Django LTS on latest supported Python
-          - python: "3.10"
-            django: "2.2"
           - python: "3.10"
             django: "3.2"
           - python: "3.12"

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ you all their normal power with a sprinkling of tagging syntactic sugar.
 * Supports **trees of nested tags**, for detailed categorisation
 * Admin support for managing tags and tagged models
 
-Supports Django 2.2+, on Python 3.6+.
+Supports Django 3.2+, on Python 3.10+.
 
 
 See the [Documentation](https://django-tagulous.readthedocs.io/)

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -21,6 +21,11 @@ Features:
 * Add ``TagTreeModel.objects.as_nested_list()``
 
 
+Changes:
+
+* Drop Django 2.2 support
+
+
 Bugfix:
 
 *  Documentation fixes (#154)

diff --git a/pyproject.toml b/pyproject.toml
@@ -13,9 +13,6 @@ readme = "README.md"
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Framework :: Django",
-    "Framework :: Django :: 2.2",
-    "Framework :: Django :: 3.0",
-    "Framework :: Django :: 3.1",
     "Framework :: Django :: 3.2",
     "Framework :: Django :: 4.0",
     "Framework :: Django :: 4.1",

diff --git a/tests/requirements/django-2.2.txt b/tests/requirements/django-2.2.txt
diff --git a/tests/test_admin.py b/tests/test_admin.py
@@ -19,6 +19,7 @@
 from django.http import HttpRequest, QueryDict
 from django.test import TestCase
 from django.urls import get_resolver, re_path, reverse
+from django.urls.resolvers import _get_cached_resolver
 
 from tagulous import admin as tag_admin
 from tagulous import forms as tag_forms
@@ -57,14 +58,7 @@ def setUp(self):
             return
 
         # Try to clear the resolver cache
-        if hasattr(get_resolver, "cache_clear"):
-            # Django 2.2
-            get_resolver.cache_clear()
-        else:
-            # Django 3.0+
-            from django.urls.resolvers import _get_cached_resolver
-
-            _get_cached_resolver.cache_clear()
+        _get_cached_resolver.cache_clear()
 
         # Store the old urls and make a copy
         self.old_urls = test_urls.urlpatterns

diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 envlist =
     clean
-    py{3.10}-django{2.2}
     py{3.10}-django{3.2}
     py{3.12}-django{4.2}
     py{3.12}-django{5.0}
@@ -28,7 +27,6 @@ basepython =
     py3.12: python3.12
 
 deps =
-    django2.2: -r tests/requirements/django-2.2.txt
     django3.2: -r tests/requirements/django-3.2.txt
     django4.2: -r tests/requirements/django-4.2.txt
     django5.0: -r tests/requirements/django-5.0.txt