Drop Django 1.11 support (#638)

Author: adamchainz

HISTORY.rst

@@ -7,6 +7,7 @@ Pending
 -------
 
 * Prevent ``collections.abc.Sequence`` warning.
+* Drop Django 1.11 support. Only Django 2.0+ is supported now.
 
 3.3.0 (2019-12-10)
 ------------------

docs/installation.rst

@@ -8,7 +8,7 @@ Requirements
 These are the supported, tested versions of Django-MySQL's requirements:
 
 * Python: 3.5, 3.6, 3.7, 3.8
-* Django: 1.11, 2.0, 2.1, 2.2, 3.0
+* Django: 2.0, 2.1, 2.2, 3.0
 * MySQL: 5.6, 5.7 / MariaDB: 10.0, 10.1, 10.2, 10.3
 * mysqlclient: 1.3
 

requirements/compile.py

@@ -11,19 +11,6 @@
     common_args = ["-m", "piptools", "compile", "--generate-hashes"] + sys.argv[1:]
     # mysqlclient requirements found on each version's "Databases" documentation page:
     # https://docs.djangoproject.com/en/2.2/ref/databases/#id6
-    subprocess.run(
-        [
-            "python3.5",
-            *common_args,
-            "-P",
-            "Django>=1.11,<2.0",
-            "-P",
-            "mysqlclient>=1.3.3,<=1.3.13",
-            "-o",
-            "py35-django111.txt",
-        ],
-        check=True,
-    )
     subprocess.run(
         [
             "python3.5",
@@ -63,19 +50,6 @@
         ],
         check=True,
     )
-    subprocess.run(
-        [
-            "python3.6",
-            *common_args,
-            "-P",
-            "Django>=1.11,<2.0",
-            "-P",
-            "mysqlclient>=1.3.3,<=1.3.13",
-            "-o",
-            "py36-django111.txt",
-        ],
-        check=True,
-    )
     subprocess.run(
         [
             "python3.6",
@@ -128,19 +102,6 @@
         ],
         check=True,
     )
-    subprocess.run(
-        [
-            "python3.7",
-            *common_args,
-            "-P",
-            "Django>=1.11,<2.0",
-            "-P",
-            "mysqlclient>=1.3.3,<=1.3.13",
-            "-o",
-            "py37-django111.txt",
-        ],
-        check=True,
-    )
     subprocess.run(
         [
             "python3.7",

requirements/py35-django111.txt

@@ -17,7 +17,6 @@ keywords =
 classifiers =
     Development Status :: 5 - Production/Stable
     Framework :: Django
-    Framework :: Django :: 1.11
     Framework :: Django :: 2.0
     Framework :: Django :: 2.1
     Framework :: Django :: 2.2
@@ -41,7 +40,7 @@ package_dir=
     =src
 packages = find:
 include_package_data = True
-install_requires = Django>=1.11
+install_requires = Django>=2.0
 python_requires = >=3.5
 zip_safe = False
 

requirements/py36-django111.txt

@@ -1,32 +1,18 @@
-import django
 from django.db.models import BooleanField, NullBooleanField
 
 
 class Bit1Mixin:
     def db_type(self, connection):
         return "bit(1)"
 
-    if django.VERSION >= (2, 0):
-
-        def from_db_value(self, value, expression, connection):
-            # 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
-
-    else:
-
-        def from_db_value(self, value, expression, connection, context):
-            # 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
+    def from_db_value(self, value, expression, connection):
+        # 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
 
     def get_prep_value(self, value):
         if value is None:

requirements/py37-django111.txt

@@ -1,7 +1,6 @@
 import json
 from datetime import date, datetime, time
 
-import django
 from django.core import checks
 from django.db.models import (
     DateField,
@@ -191,17 +190,9 @@ def to_python(self, value):
             return json.loads(value)  # serialization framework
         return value
 
-    if django.VERSION >= (2, 0):
-
-        def from_db_value(self, value, expression, connection):
-            # Used to always convert a value from the database
-            return self.to_python(value)
-
-    else:
-
-        def from_db_value(self, value, expression, connection, context):
-            # Used to always convert a value from the database
-            return self.to_python(value)
+    def from_db_value(self, value, expression, connection):
+        # Used to always convert a value from the database
+        return self.to_python(value)
 
     def get_prep_value(self, value):
         value = super().get_prep_value(value)

setup.cfg

@@ -1,6 +1,5 @@
 import json
 
-import django
 from django.core import checks
 from django.db.models import Field, IntegerField, Transform
 
@@ -136,19 +135,10 @@ def get_transform(self, name):
             return transform  # pragma: no cover
         return KeyTransformFactory(name)
 
-    if django.VERSION >= (2, 0):
-
-        def from_db_value(self, value, expression, connection):
-            if isinstance(value, str):
-                return self.json_decoder.decode(value)
-            return value
-
-    else:
-
-        def from_db_value(self, value, expression, connection, context):
-            if isinstance(value, str):
-                return self.json_decoder.decode(value)
-            return value
+    def from_db_value(self, value, expression, connection):
+        if isinstance(value, str):
+            return self.json_decoder.decode(value)
+        return value
 
     def get_prep_value(self, value):
         if value is not None and not isinstance(value, str):