Drop Django 3.2 to 4.1 support (#1118)

These versions are all EOL since April.
adamchainz · Oct 29, 2024 · d3ed6c6 · d3ed6c6
1 parent a9e6ed6
commit d3ed6c6
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 1,499 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -44,7 +44,7 @@ repos:
   rev: 1.21.0
   hooks:
   - id: django-upgrade
-    args: [--target-version, '3.2']
+    args: [--target-version, '4.2']
 - repo: https://github.com/psf/black-pre-commit-mirror
   rev: 24.10.0
   hooks:

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,11 @@
 Changelog
 =========
 
+Unreleased
+----------
+
+* Drop Django 3.2 to 4.1 support.
+
 * Drop Python 3.8 support.
 
 * Support Python 3.13.

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -6,7 +6,7 @@ Requirements
 
 Python 3.9 to 3.13 supported.
 
-Django 3.2 to 5.1 supported.
+Django 4.2 to 5.1 supported.
 
 Tested on MySQL 8.0+ and MariaDB 10.5+.
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -21,9 +21,6 @@ requires-python = ">=3.9"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Framework :: Django",
-  "Framework :: Django :: 3.2",
-  "Framework :: Django :: 4.0",
-  "Framework :: Django :: 4.1",
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.0",
   "Framework :: Django :: 5.1",
@@ -42,7 +39,7 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "django>=3.2",
+  "django>=4.2",
 ]
 urls.Changelog = "https://django-mysql.readthedocs.io/en/latest/changelog.html"
 urls.Documentation = "https://django-mysql.readthedocs.io/"

diff --git a/src/django_mysql/models/fields/bit.py b/src/django_mysql/models/fields/bit.py
@@ -14,13 +14,7 @@ def db_type(self, connection: BaseDatabaseWrapper) -> str:
     def from_db_value(
         self, value: Any, expression: Expression, connection: BaseDatabaseWrapper
     ) -> Any:
-        # Meant to be binary/bytes but can come back as unicode strings
-        if isinstance(value, bytes):
-            value = value == b"\x01"
-        elif isinstance(value, str):
-            # Only on older versions of mysqlclient and Py 2.7
-            value = value == "\x01"  # pragma: no cover
-        return value
+        return value == b"\x01"
 
     def get_prep_value(self, value: Any) -> int | None:
         if value is None:

diff --git a/src/django_mysql/models/fields/enum.py b/src/django_mysql/models/fields/enum.py
@@ -3,7 +3,6 @@
 from typing import Any
 from typing import cast
 
-import django
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.models import CharField
 from django.utils.encoding import force_str
@@ -15,8 +14,7 @@
 class EnumField(CharField):
     description = _("Enumeration")
 
-    if django.VERSION >= (4, 1):
-        non_db_attrs = tuple(f for f in CharField.non_db_attrs if f != "choices")
+    non_db_attrs = tuple(f for f in CharField.non_db_attrs if f != "choices")
 
     def __init__(
         self,

diff --git a/tests/requirements/compile.py b/tests/requirements/compile.py
@@ -23,36 +23,6 @@
     run = partial(subprocess.run, check=True)
     # mysqlclient requirements found on each version's "Databases" documentation page:
     # https://docs.djangoproject.com/en/3.0/ref/databases/#mysql-db-api-drivers
-    run(
-        [
-            *common_args,
-            "--python",
-            "3.9",
-            "--output-file",
-            "py39-django32.txt",
-        ],
-        input=b"Django>=3.2a1,<3.3\nmysqlclient>=1.4.0\n",
-    )
-    run(
-        [
-            *common_args,
-            "--python",
-            "3.9",
-            "--output-file",
-            "py39-django40.txt",
-        ],
-        input=b"Django>=4.0a1,<4.1\nmysqlclient>=1.4.0\n",
-    )
-    run(
-        [
-            *common_args,
-            "--python",
-            "3.9",
-            "--output-file",
-            "py39-django41.txt",
-        ],
-        input=b"Django>=4.1a1,<4.2\nmysqlclient>=1.4.0\n",
-    )
     run(
         [
             *common_args,
@@ -63,36 +33,6 @@
         ],
         input=b"Django>=4.2a1,<5.0\nmysqlclient>=1.4.3\n",
     )
-    run(
-        [
-            *common_args,
-            "--python",
-            "3.10",
-            "--output-file",
-            "py310-django32.txt",
-        ],
-        input=b"Django>=3.2a1,<3.3\nmysqlclient>=1.4.0\n",
-    )
-    run(
-        [
-            *common_args,
-            "--python",
-            "3.10",
-            "--output-file",
-            "py310-django40.txt",
-        ],
-        input=b"Django>=4.0a1,<4.1\nmysqlclient>=1.4.0\n",
-    )
-    run(
-        [
-            *common_args,
-            "--python",
-            "3.10",
-            "--output-file",
-            "py310-django41.txt",
-        ],
-        input=b"Django>=4.1a1,<4.2\nmysqlclient>=1.4.0\n",
-    )
     run(
         [
             *common_args,
@@ -123,16 +63,6 @@
         ],
         input=b"Django>=5.1a1,<5.2\nmysqlclient>=1.4.3\n",
     )
-    run(
-        [
-            *common_args,
-            "--python",
-            "3.11",
-            "--output-file",
-            "py311-django41.txt",
-        ],
-        input=b"Django>=4.1a1,<4.2\nmysqlclient>=1.4.0\n",
-    )
     run(
         [
             *common_args,

diff --git a/tests/requirements/py310-django32.txt b/tests/requirements/py310-django32.txt