Drop django 1.4 to 1.7 support (#8)

- Removed reference to django.db.models.fields.subclassing.SubfieldBase (resolves #7) and conditional import for `django.core.checks`. 
- Removed the `timezone_utils/models.py` and `timezone_utils/migrations`. This means that only Django 1.8+ is now supported.
- Removed support for Python versions < 2.6. The Django 1.6 series was the last to support Python 2.6.
- Added testing support for Django 1.10.
- Coverage fix: calling the super(DateTimeField, self).to_python(value) will convert a naive datetime, so the is_naive condition would never be reached.
- Changed development status from `Beta` to `Production/Stable`.
- Added contributor Alex Kamedov.
- Updated documentation copyright year to 2016.
- Version bump to `0.11`.
- Minor PEP8 changes.

Author: michaeljohnbarr

.travis.yml

@@ -2,23 +2,21 @@ language:
   python
 
 python:
-  - "2.6"
   - "2.7"
+  # https://docs.djangoproject.com/en/dev/releases/1.8/#python-compatibility
+  # Due to the end of upstream support for Python 3.2 in February 2016, we
+  # won’t test Django 1.8.x on Python 3.2 after the end of 2016.
   - "3.2"
   - "3.3"
   - "3.4"
   - "3.5"
-  - "3.5-dev"
   - "nightly"
 
 env:
   - DJANGO="https://github.com/django/django/archive/master.tar.gz"
-  - DJANGO="django>=1.9.0,<1.10.0"
-  - DJANGO="django>=1.8.0,<1.9.0"
-  - DJANGO="django>=1.7.0,<1.8.0"
-  - DJANGO="django>=1.6.0,<1.7.0"
-  - DJANGO="django>=1.5.0,<1.6.0"
-  - DJANGO="django>=1.4.0,<1.5.0"
+  - DJANGO="django>=1.10,<1.11"
+  - DJANGO="django>=1.9,<1.10"
+  - DJANGO="django>=1.8,<1.9"
 
 install:
   - travis_retry pip install $DJANGO
@@ -38,40 +36,27 @@ notifications:
 
 matrix:
   exclude:
+    # https://docs.djangoproject.com/en/dev/releases/1.9/#python-compatibility
+    # Django 1.9 requires Python 2.7, 3.4, or 3.5
     - python: "3.2"
-      env: DJANGO="django>=1.4.0,<1.5.0"
-    - python: "3.2"
-      env: DJANGO="django>=1.9.0,<1.10.0"
+      env: DJANGO="django>=1.9,<1.10"
     - python: "3.3"
-      env: DJANGO="django>=1.4.0,<1.5.0"
+      env: DJANGO="django>=1.9,<1.10"
+    # https://docs.djangoproject.com/en/dev/releases/1.10/#python-compatibility
+    # Django 1.10 requires Python 2.7, 3.4, or 3.5
+    - python: "3.2"
+      env: DJANGO="django>=1.10,<1.11"
     - python: "3.3"
-      env: DJANGO="django>=1.9.0,<1.10.0"
-    - python: "3.4"
-      env: DJANGO="django>=1.4.0,<1.5.0"
-    - python: "3.5"
-      env: DJANGO="django>=1.4.0,<1.5.0"
-    - python: "3.5"
-      env: DJANGO="django>=1.5.0,<1.6.0"
-    - python: "3.5"
-      env: DJANGO="django>=1.6.0,<1.7.0"
-    - python: "3.5"
-      env: DJANGO="django>=1.7.0,<1.8.0"
-#    - python: "pypy"
-#      env: DJANGO="django>=1.4.0,<1.5.0"
-#    - python: "pypy3"
-#      env: DJANGO="django>=1.4.0,<1.5.0"
-    - python: "2.6"
-      env: DJANGO="django>=1.7.0,<1.8.0"
-    - python: "2.6"
-      env: DJANGO="django>=1.8.0,<1.9.0"
-    - python: "2.6"
-      env: DJANGO="django>=1.9.0,<1.10.0"
-    - python: "2.6"
+      env: DJANGO="django>=1.10,<1.11"
+    # https://docs.djangoproject.com/en/dev/releases/1.11/#python-compatibility
+    # Django 1.11 requires Python 2.7, 3.4, or 3.5.
+    # The Django 1.11.x series is the last to support Python 2.
+    # The next major release, Django 2.0, will only support Python 3.5+
+    - python: "3.2"
       env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
-    - python: "2.6"
+    - python: "3.3"
       env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
   allow_failures:
     - env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
-    - python: "3.5-dev"
     - python: "nightly"
   fast_finish: true

README.rst

@@ -33,8 +33,7 @@ Django Timezone Utils: Time Zone Utilities For Models
 **django-timezone-utils** adds automatic time zone conversions and support
 utilities to Django.
 
-Please note that this project is currently marked as a development status of
-*Beta*. Suggestions, constructive criticism, and feedback are certainly
+Suggestions, constructive criticism, and feedback are certainly
 welcomed and appreciated.
 
 Documentation
@@ -51,7 +50,7 @@ ever had to deal with this, you will know how complicated this can be.
 
 I created these fields to ease the process of manipulating times based on
 another field's or models timezone choice. Instead of having to remember to use
-``Model.clean_fields``, we can now create the models with the validation built
+``Model.clean``, we can now create the models with the validation built
 into the model field.
 
 
@@ -105,9 +104,11 @@ Contributors
 
 * `Michael Barr <http://github.com/michaeljohnbarr>`_
 * `Kosei Kitahara <https://github.com/Surgo>`_
+* `Alex Kamedov <https://github.com/alekam>`_
 
 Changelog
 ---------
+- 0.11 Removed reference to django.db.models.fields.subclassing.SubfieldBase, which means that only Django 1.8+ is now supported. Removed support for Python versions < 2.6. The Django 1.6 series was the last to support Python 2.6. Added testing support for Django 1.10. Changed development status from Beta to Production/Stable.
 - 0.10 Added testing support for Python 3.5 and Django 1.9.
 - 0.9 Corrected a bug to where ``time_override`` caused invalid date due to not converting to the correct timezone first. Refactored conversion code. Added testing support for Django 1.8. Removed Django from setup requirements - the onus of having a supported version of Django is on the developer.
 - 0.8 Corrected a bug to where ``time_override`` caused invalid date due to not converting to the correct timezone first. Added choices ``GROUPED_ALL_TIMEZONES_CHOICES`` and ``GROUPED_COMMON_TIMEZONES_CHOICES`` to the documentation.

docs/conf.py

@@ -18,7 +18,7 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+# sys.path.insert(0, os.path.abspath('.'))
 
 # -- General configuration ------------------------------------------------
 
@@ -44,16 +44,16 @@
 
 # General information about the project.
 project = u'Django Timezone Utils'
-copyright = u'2015, Michael Barr'
+copyright = u'2016, Michael Barr'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.10'
+version = '0.11'
 # The full version, including alpha/beta/rc tags.
-release = '0.10'
+release = '0.11'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/setup.rst

@@ -17,7 +17,7 @@ modify your ``INSTALLED_APPS`` setting.
 Dependencies
 ============
 
-* Supports `Django`_ 1.4+ on Python 2.6, 2.7, 3.2, 3.3, and 3.4.
+* Supports `Django`_ 1.8+ on Python 2.7, 3.2, 3.3, 3.4, and 3.5.
 * Requires `pytz`_ for time zone conversions.
 
 .. _Django: http://www.djangoproject.com/

run_tests.py

@@ -43,13 +43,10 @@
         TIME_ZONE='UTC',
         SECRET_KEY='secret',
         LANGUAGE_CODE = 'en-us',
-        # TIME_ZONE = 'UTC',
-        USE_I18N = True,
-        USE_L10N = True,
-        # USE_TZ = True,
-
-        SITE_ID = 1,
-        TEST_DATETIME = timezone.make_aware(
+        USE_I18N=True,
+        USE_L10N=True,
+        SITE_ID=1,
+        TEST_DATETIME=timezone.make_aware(
             datetime(2014, 1, 1), pytz.timezone('UTC')
         ),
         # SILENCED_SYSTEM_CHECKS=['1_7.W001'],

setup.py

@@ -21,21 +21,20 @@
     packages=['timezone_utils'],
     install_requires=[
         'pytz',
-        'django>=1.4,<1.10'
+        'django>=1.8'
     ],
     zip_safe=False,
     platforms='any',
     include_package_data=True,
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Framework :: Django',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',

timezone_utils/fields.py

@@ -1,40 +1,30 @@
-# ==============================================================================
+# =============================================================================
 # IMPORTS
-# ==============================================================================
+# =============================================================================
 # Python
 from __future__ import unicode_literals
 from datetime import datetime, tzinfo, time as datetime_time
 import pytz
 import warnings
 
 # Django
-import django
-try:
-    from django.core import checks
-except ImportError:     # pragma: no cover
-    pass
+from django.core import checks
 from django.core.exceptions import ValidationError
-from django.db import models
 from django.db.models.fields import DateTimeField, CharField
-from django.utils.six import with_metaclass
 from django.utils.timezone import get_default_timezone, is_naive, make_aware
 from django.utils.translation import ugettext_lazy as _
 
 # App
 from timezone_utils import forms
 
 
-TimeZoneFieldBase = type if django.VERSION >= (1, 8) else models.SubfieldBase
-
 __all__ = ('TimeZoneField', 'LinkedTZDateTimeField')
 
 
-# ==============================================================================
+# =============================================================================
 # MODEL FIELDS
-# ==============================================================================
-class TimeZoneField(    # pylint: disable=E0239
-    with_metaclass(TimeZoneFieldBase, CharField)
-):
+# =============================================================================
+class TimeZoneField(CharField):
     # Enforce the minimum length of max_length to be the length of the longest
     #   pytz timezone string
     MIN_LENGTH = max(map(len, pytz.all_timezones))
@@ -128,9 +118,9 @@ def formfield(self, **kwargs):
         defaults.update(**kwargs)
         return super(TimeZoneField, self).formfield(**defaults)
 
-    # --------------------------------------------------------------------------
-    # Django >= 1.7 Checks Framework
-    # --------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    # Django Checks Framework
+    # -------------------------------------------------------------------------
     # pylint: disable=E0239
     def check(self, **kwargs):  # pragma: no cover
         """Calls the TimeZoneField's custom checks."""
@@ -142,8 +132,8 @@ def check(self, **kwargs):  # pragma: no cover
 
     def _check_timezone_max_length_attribute(self):     # pragma: no cover
         """
-        Checks that the `max_length` attribute covers all possible pytz timezone
-        lengths.
+        Checks that the `max_length` attribute covers all possible pytz
+        timezone lengths.
         """
 
         # Retrieve the maximum possible length for the time zone string
@@ -155,14 +145,14 @@ def _check_timezone_max_length_attribute(self):     # pragma: no cover
             return [
                 checks.Error(
                     msg=(
-                        "'max_length' is too short to support all possible pytz"
-                        " time zones."
+                        "'max_length' is too short to support all possible "
+                        "pytz time zones."
                     ),
                     hint=(
-                        "pytz {version}'s longest time zone string has a length"
-                        " of {value}, although it is recommended that you leave"
-                        " room for longer time zone strings to be added in the "
-                        "future.".format(
+                        "pytz {version}'s longest time zone string has a "
+                        "length of {value}, although it is recommended that "
+                        "you leave room for longer time zone strings to be "
+                        "added in the future.".format(
                             version=pytz.VERSION,
                             value=possible_max_length
                         )
@@ -230,9 +220,7 @@ def _check_choices_attribute(self):   # pragma: no cover
         return []
 
 
-class LinkedTZDateTimeField(
-    with_metaclass(TimeZoneFieldBase, DateTimeField)
-):  # pylint: disable=E0239
+class LinkedTZDateTimeField(DateTimeField):
     # pylint: disable=newstyle
     def __init__(self, *args, **kwargs):
         self.populate_from = kwargs.pop('populate_from', None)
@@ -246,7 +234,6 @@ def from_db_value(self, value, expression, connection, context):
         if value:
             value = self.to_python(value)
 
-
         return value
 
     def to_python(self, value):
@@ -257,9 +244,6 @@ def to_python(self, value):
         if not value:
             return value
 
-        if is_naive(value):
-            return make_aware(value=value, timezone=self.timezone)
-
         return value.astimezone(self.timezone)
 
     def pre_save(self, model_instance, add):
@@ -298,9 +282,9 @@ def deconstruct(self):  # pragma: no cover
 
         # Only include kwarg if it's not the default
         if self.populate_from is not None:
-            # Since populate_from requires a model instance and Django does not,
-            #   allow lambda, we hope that we have been provided a function that
-            #   can be parsed
+            # Since populate_from requires a model instance and Django does
+            #   not allow lambda, we hope that we have been provided a
+            #   function that can be parsed
             kwargs['populate_from'] = self.populate_from
 
         # Only include kwarg if it's not the default
@@ -314,7 +298,9 @@ def deconstruct(self):  # pragma: no cover
         return name, path, args, kwargs
 
     def _get_populate_from(self, model_instance):
-        """Retrieves the timezone or None from the `populate_from` attribute."""
+        """
+        Retrieves the timezone or None from the `populate_from` attribute.
+        """
 
         if hasattr(self.populate_from, '__call__'):
             tz = self.populate_from(model_instance)
@@ -370,8 +356,8 @@ def _convert_value(self, value, model_instance, add):
             value = make_aware(value=value, timezone=tz)
 
         # Convert the value to a datetime object in the correct timezone. This
-        # insures that we will have the correct date if we are performing a time
-        #   override below.
+        #   insures that we will have the correct date if we are performing a
+        #   time override below.
         value = value.astimezone(tz)
 
         # Do not convert the time to the time override if auto_now or