Drop support for end-of-life Django 2.2

FactoryBoy · Aug 17, 2022 · 27e55cc · 27e55cc
1 parent 9ecdf1c
commit 27e55cc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -62,9 +62,7 @@ test:
 		-Wdefault:"Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working":DeprecationWarning:: \
 		-Wdefault:"set_output_charset() is deprecated":DeprecationWarning:: \
 		-Wdefault:"parameter codeset is deprecated":DeprecationWarning:: \
-		-Wdefault:"distutils Version classes are deprecated. Use packaging.version instead":DeprecationWarning:: \
 		-m unittest
-# TODO: Remove "distutils Version classes are deprecated" when django 2.2 is dropped
 
 # DOC: Test the examples
 example-test:

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -46,6 +46,7 @@ ChangeLog
 
 *Removed:*
 
+    - Drop support for Django 2.2
     - Drop support for Django 3.0
     - Drop support for Django 3.1
     - Drop support for Python 3.6

diff --git a/examples/django_demo/django_demo/urls.py b/examples/django_demo/django_demo/urls.py
@@ -13,13 +13,9 @@
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-try:
-    # TODO: After dropping Django 2.2, switch to `path`
-    from django.urls import re_path as url
-except ImportError:
-    from django.conf.urls import url
 from django.contrib import admin
+from django.urls import path
 
 urlpatterns = [
-    url(r'^admin/', admin.site.urls),
+    path('admin/', admin.site.urls),
 ]
diff --git a/setup.cfg b/setup.cfg
@@ -15,7 +15,6 @@ license = MIT
 classifiers =
     Development Status :: 5 - Production/Stable
     Framework :: Django
-    Framework :: Django :: 2.2
     Framework :: Django :: 3.2
     Framework :: Django :: 4.0
     Intended Audience :: Developers

diff --git a/tox.ini b/tox.ini
@@ -6,7 +6,6 @@ envlist =
     examples
     linkcheck
     py{37,38,39,310,py37,py38,py39}-sqlite
-    py{37,38,39,py37,py38,py39}-django22-mongo-alchemy-{sqlite,postgres}
     py{37,38,39,310,py37,py38,py39}-django32-mongo-alchemy-{sqlite,postgres}
     py{38,39,310,py38,py39}-django40-mongo-alchemy-{sqlite,postgres}
     py310-djangomain-mongo-alchemy-{sqlite,postgres}
@@ -35,8 +34,7 @@ deps =
     alchemy: SQLAlchemy
     alchemy: sqlalchemy_utils
     mongo: mongoengine
-    django{22,32,40,main}: Pillow
-    django22: Django>=2.2,<2.3
+    django{32,40,main}: Pillow
     django32: Django>=3.2,<3.3
     django40: Django>=4.0,<4.1
     djangomain: https://github.com/django/django/archive/main.tar.gz