Drop support for Django < 3.2

jazzband · Aug 17, 2022 · bd0e5a8 · bd0e5a8
1 parent 2dab8af
commit bd0e5a8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 15 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,6 +7,7 @@ Unreleased
 - Confirm support for `Django 4.0`
 - Add Spanish translation
 - Add French translation
+- Drop support for `Django < 3.2`
 
 4.2.0 (2021-10-11)
 ------------------

diff --git a/README.rst b/README.rst
@@ -20,7 +20,7 @@ django-model-utils
 
 Django model mixins and utilities.
 
-``django-model-utils`` supports `Django`_ 2.2+.
+``django-model-utils`` supports `Django`_ 3.2+.
 
 .. _Django: http://www.djangoproject.com/
 

diff --git a/docs/setup.rst b/docs/setup.rst
@@ -17,7 +17,7 @@ modify your ``INSTALLED_APPS`` setting.
 Dependencies
 ============
 
-``django-model-utils`` supports `Django`_ 2.2, 3.1 and 3.2 (latest bugfix
+``django-model-utils`` supports `Django`_ 3.2+ (latest bugfix
 release in each series only) on Python 3.6+.
 
 .. _Django: http://www.djangoproject.com/
diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@ def long_desc(root_path):
     maintainer='JazzBand',
     url='https://github.com/jazzband/django-model-utils',
     packages=find_packages(exclude=['tests*']),
-    install_requires=['Django>=2.2'],
+    install_requires=['Django>=3.2'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
@@ -44,8 +44,6 @@ def long_desc(root_path):
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Framework :: Django',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
         'Framework :: Django :: 4.0',
     ],

diff --git a/tests/models.py b/tests/models.py
@@ -387,13 +387,9 @@ def __get__(self, obj, cls=None):
             return self
         if self.name in obj.get_deferred_fields():
             # This queries the database, and sets the value on the instance.
-            if django.VERSION < (3, 0):
-                DeferredAttribute(field_name=self.name).__get__(obj, cls)
-            else:
-                # Since Django 3.0, DeferredAttribute wants a field argument.
-                fields_map = {f.name: f for f in cls._meta.fields}
-                field = fields_map[self.name]
-                DeferredAttribute(field=field).__get__(obj, cls)
+            fields_map = {f.name: f for f in cls._meta.fields}
+            field = fields_map[self.name]
+            DeferredAttribute(field=field).__get__(obj, cls)
         return str(obj.__dict__[self.name])
 
     def __set__(self, obj, value):

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,5 @@
 [tox]
 envlist =
-    py{36,37,38,39}-dj{22,31}
     py{36,37,38,39,310}-dj32
     py{38,39,310}-dj{40,main}
     flake8
@@ -18,8 +17,6 @@ python =
 deps =
     freezegun==0.3.12
     -rrequirements-test.txt
-    dj22: Django==2.2.*
-    dj31: Django==3.1.*
     dj32: Django==3.2.*
     dj40: Django==4.0.*
     djmain: https://github.com/django/django/archive/main.tar.gz