Drop support for Django 1.8

Author: Alex Hill

.travis.yml

@@ -11,9 +11,6 @@ env:
   global:
     - DJANGO_SETTINGS_MODULE=tests.settings
   matrix:
-    - DJANGO_VERSION=1.8.19 DB=mysql
-    - DJANGO_VERSION=1.8.19 DB=postgres
-    - DJANGO_VERSION=1.8.19 DB=sqlite
     - DJANGO_VERSION=1.11.18 DB=mysql
     - DJANGO_VERSION=1.11.18 DB=postgres
     - DJANGO_VERSION=1.11.18 DB=sqlite

naivedatetimefield/__init__.py

@@ -2,19 +2,16 @@
 import sys
 import warnings
 
-import django
 import pytz
 from django.core import exceptions, checks
 from django.db.models import DateTimeField, Func, Value
+from django.db.models.functions.datetime import TruncBase, Extract, ExtractYear
+from django.db.models.lookups import Exact, GreaterThan, GreaterThanOrEqual, \
+    LessThan, LessThanOrEqual
 from django.utils import timezone
 from django.utils.dateparse import parse_date, parse_datetime
 from django.utils.translation import gettext_lazy as _
 
-if django.VERSION >= (1, 11):
-    from django.db.models.functions.datetime import TruncBase, Extract, ExtractYear
-    from django.db.models.lookups import Exact, GreaterThan, GreaterThanOrEqual, \
-        LessThan, LessThanOrEqual
-
 
 class NaiveDateTimeField(DateTimeField):
     description = _("Naive Date (with time)")
@@ -123,7 +120,7 @@ def get_prep_value(self, value):
         return super(DateTimeField, self).get_prep_value(value)
 
     def from_db_value(self, value, expression, connection, context):
-        is_truncbase = django.VERSION >= (1, 11) and isinstance(expression, TruncBase)
+        is_truncbase = isinstance(expression, TruncBase)
         if is_truncbase and not isinstance(expression, NaiveAsSQLMixin):
             raise TypeError(
                 "Django's %s cannot be used with a NaiveDateTimeField"
@@ -134,8 +131,6 @@ def from_db_value(self, value, expression, connection, context):
                 return timezone.make_naive(value, pytz.utc)
             return value
         if timezone.is_aware(value):
-            if django.VERSION < (1, 9):
-                return timezone.make_naive(value, pytz.utc)
             return timezone.make_naive(value, connection.timezone)
         return value
 
@@ -210,33 +205,32 @@ def _resolve_output_field(self):
 _monkeypatching = False
 
 
-if django.VERSION >= (1, 11):
-    _this_module = sys.modules[__name__]
-    _db_functions = sys.modules['django.db.models.functions']
-    _lookups = set(DateTimeField.get_lookups().values())
-    _patch_classes = [
-        (Extract, [NaiveAsSQLMixin, NaiveTimezoneMixin]),
-        (TruncBase, [NaiveAsSQLMixin, NaiveTimezoneMixin, NaiveConvertValueMixin]),
-    ]
-    for original, mixins in _patch_classes:
-        for cls in original.__subclasses__():
-
-            bases = tuple(mixins) + (cls,)
-            naive_cls = type(cls.__name__, bases, {})
-
-            if _monkeypatching:
-                setattr(_db_functions, cls.__name__, naive_cls)
-
-            if cls in _lookups:
-                NaiveDateTimeField.register_lookup(naive_cls)
-
-                # Year lookups don't need special handling with naive fields
-                if cls is ExtractYear:
-                    naive_cls.register_lookup(Exact)
-                    naive_cls.register_lookup(GreaterThan)
-                    naive_cls.register_lookup(GreaterThanOrEqual)
-                    naive_cls.register_lookup(LessThan)
-                    naive_cls.register_lookup(LessThanOrEqual)
-
-            # Add an attribute to this module so these functions can be imported
-            setattr(_this_module, cls.__name__, naive_cls)
+_this_module = sys.modules[__name__]
+_db_functions = sys.modules['django.db.models.functions']
+_lookups = set(DateTimeField.get_lookups().values())
+_patch_classes = [
+    (Extract, [NaiveAsSQLMixin, NaiveTimezoneMixin]),
+    (TruncBase, [NaiveAsSQLMixin, NaiveTimezoneMixin, NaiveConvertValueMixin]),
+]
+for original, mixins in _patch_classes:
+    for cls in original.__subclasses__():
+
+        bases = tuple(mixins) + (cls,)
+        naive_cls = type(cls.__name__, bases, {})
+
+        if _monkeypatching:
+            setattr(_db_functions, cls.__name__, naive_cls)
+
+        if cls in _lookups:
+            NaiveDateTimeField.register_lookup(naive_cls)
+
+            # Year lookups don't need special handling with naive fields
+            if cls is ExtractYear:
+                naive_cls.register_lookup(Exact)
+                naive_cls.register_lookup(GreaterThan)
+                naive_cls.register_lookup(GreaterThanOrEqual)
+                naive_cls.register_lookup(LessThan)
+                naive_cls.register_lookup(LessThanOrEqual)
+
+        # Add an attribute to this module so these functions can be imported
+        setattr(_this_module, cls.__name__, naive_cls)

tests/tests.py

@@ -1,7 +1,6 @@
 import datetime
 from unittest import skipIf
 
-import django
 import pytz
 from django import db
 from django.contrib.auth.models import User
@@ -76,7 +75,6 @@ def test_timezones_ignored(self):
             self.assertEqual(o1.naive, naive)
             self.assertEqual(o2.naive, naive)
 
-    @skipIf(django.VERSION < (1, 11), "date transforms and lookups unavailable before Django 1.11")
     def test_time_lookup(self):
         """
         This should test that __time lookups work properly on naive datetime fields
@@ -94,7 +92,6 @@ def test_time_lookup(self):
 
         self.assertEqual(results.count(), 1)
 
-    @skipIf(django.VERSION < (1, 11), "date transforms and lookups unavailable before Django 1.11")
     def test_date_trunc(self):
         """
         Test that date truncating works regardless of active timezone.
@@ -137,7 +134,6 @@ def query_truncations(module):
         with self.assertRaisesRegex(TypeError, r"Django's \w+ cannot be used with a NaiveDateTimeField"):
             query_truncations(functions)
 
-    @skipIf(django.VERSION < (1, 11), "date transforms and lookups unavailable before Django 1.11")
     def test_date_transforms(self):
         """
         Test that date transforms work regardless of active timezone.
@@ -238,7 +234,6 @@ def test_in_timezone(tz):
         test_in_timezone('Pacific/Chatham')  # +12:45/+13:45
         test_in_timezone('Pacific/Marquesas')  # -09:30
 
-    @skipIf(django.VERSION < (1, 11), "date transforms and lookups unavailable before Django 1.11")
     def test_date_extract_annotations(self):
         """
         Test that date truncating works regardless of active timezone.