Remove Django 1.4, and Python 2.6 and 3.2 support

Author: macro1

.travis.yml

@@ -4,44 +4,32 @@ sudo: false
 
 python:
   - 2.7
-  - 3.2
   - 3.3
+  - 3.4
+  - 3.5
 
 env:
-  - DJANGO="Django>=1.4,<1.5"
   - DJANGO="Django>=1.6,<1.7"
   - DJANGO="Django>=1.7,<1.8"
   - DJANGO="Django>=1.8,<1.9"
-  - DJANGO="Django>=1.9a,<1.10"
+  - DJANGO="Django>=1.9,<1.10"
 
 install:
-  - pip install -U 'coverage<4' codecov
+  - pip install -U coverage codecov
   - pip install -U $DJANGO
   - python -c 'from __future__ import print_function; import django; print("Django " + django.get_version())'
 
 script: coverage run setup.py test
 
 matrix:
   exclude:
-   - python: 3.2
-     env: DJANGO="Django>=1.4,<1.5"
-   - python: 3.3
-     env: DJANGO="Django>=1.4,<1.5"
-   - python: 3.2
-     env: DJANGO="Django>=1.9a,<1.10"
-   - python: 3.3
-     env: DJANGO="Django>=1.9a,<1.10"
-
-  include:
-   - python: 2.6
-     env: DJANGO="Django>=1.4,<1.5"
    - python: 3.4
-     env: DJANGO="Django>=1.7,<1.8"
-   - python: 3.4
-     env: DJANGO="Django>=1.8,<1.9"
+     env: DJANGO="Django>=1.6,<1.7"
    - python: 3.5
-     env: DJANGO="Django>=1.8,<1.9"
+     env: DJANGO="Django>=1.6,<1.7"
    - python: 3.5
+     env: DJANGO="Django>=1.7,<1.8"
+   - python: 3.3
      env: DJANGO="Django>=1.9,<1.10"
 
 after_success: codecov

README.rst

@@ -20,7 +20,7 @@ django-simple-history
 
 django-simple-history stores Django model state on every create/update/delete.
 
-This app requires Django 1.4.2, 1.6, or greater and Python 2.6 or greater.
+This app requires Django 1.6 or greater and Python 2.7, 3.3, or greater.
 
 Getting Help
 ------------

simple_history/admin.py

@@ -18,12 +18,8 @@
     from django.contrib.admin.utils import unquote
 except ImportError:  # Django < 1.7
     from django.contrib.admin.util import unquote
-try:
-    USER_NATURAL_KEY = settings.AUTH_USER_MODEL
-except AttributeError:  # Django < 1.5
-    USER_NATURAL_KEY = "auth.User"
 
-USER_NATURAL_KEY = tuple(key.lower() for key in USER_NATURAL_KEY.split('.', 1))
+USER_NATURAL_KEY = tuple(key.lower() for key in settings.AUTH_USER_MODEL.split('.', 1))
 
 SIMPLE_HISTORY_EDIT = getattr(settings, 'SIMPLE_HISTORY_EDIT', False)
 

simple_history/manager.py

@@ -20,10 +20,7 @@ def __init__(self, model, instance=None):
         self.instance = instance
 
     def get_super_queryset(self):
-        try:
-            return super(HistoryManager, self).get_queryset()
-        except AttributeError:  # Django < 1.6
-            return super(HistoryManager, self).get_query_set()
+        return super(HistoryManager, self).get_queryset()
 
     def get_queryset(self):
         qs = self.get_super_queryset()

simple_history/models.py

@@ -1,13 +1,11 @@
 from __future__ import unicode_literals
 
-import threading
 import copy
-import warnings
+import importlib
+import threading
 
-import django
 from django.db import models, router
 from django.db.models.fields.proxy import OrderWrt
-from django.db.models.fields.related import RelatedField
 from django.conf import settings
 from django.contrib import admin
 from django.utils import six
@@ -20,10 +18,6 @@
     from django.apps import apps
 except ImportError:  # Django < 1.7
     from django.db.models import get_app
-try:
-    import importlib
-except ImportError:  # Python < 2.7
-    from django.utils import importlib
 try:
     from south.modelsinspector import add_introspection_rules
 except ImportError:  # south not present
@@ -139,19 +133,14 @@ def copy_fields(self, model):
                 field.__class__ = models.IntegerField
             if isinstance(field, models.ForeignKey):
                 old_field = field
-                field_arguments = {}
+                field_arguments = {'db_constraint': False}
                 if (getattr(old_field, 'one_to_one', False) or
                         isinstance(old_field, models.OneToOneField)):
                     FieldType = models.ForeignKey
                 else:
                     FieldType = type(old_field)
-                if django.get_version() >= "1.6":
-                    field_arguments['db_constraint'] = False
                 if getattr(old_field, 'to_fields', []):
                     field_arguments['to_field'] = old_field.to_fields[0]
-                elif (django.get_version() < "1.6" and
-                      old_field.rel.field_name != 'id'):
-                    field_arguments['to_field'] = old_field.rel.field_name
                 if getattr(old_field, 'db_column', None):
                     field_arguments['db_column'] = old_field.db_column
                 field = FieldType(
@@ -261,81 +250,6 @@ def get_history_user(self, instance):
                 return None
 
 
-class CustomForeignKeyField(models.ForeignKey):
-
-    def __init__(self, *args, **kwargs):
-        warnings.warn("CustomForeignKeyField is deprecated.",
-                      DeprecationWarning)
-        super(CustomForeignKeyField, self).__init__(*args, **kwargs)
-        self.db_constraint = False
-        self.generate_reverse_relation = False
-
-    def get_attname(self):
-        return self.name
-
-    def get_one_to_one_field(self, to_field, other):
-        # HACK This creates a new custom foreign key based on to_field,
-        # and calls itself with that, effectively making the calls
-        # recursive
-        temp_field = self.__class__(to_field.rel.to._meta.object_name)
-        for key, val in to_field.__dict__.items():
-            if (isinstance(key, six.string_types)
-                    and not key.startswith('_')):
-                setattr(temp_field, key, val)
-        field = self.__class__.get_field(
-            temp_field, other, to_field.rel.to)
-        return field
-
-    def get_field(self, other, cls):
-        # this hooks into contribute_to_class() and this is
-        # called specifically after the class_prepared signal
-        to_field = copy.copy(self.rel.to._meta.pk)
-        field = self
-        if isinstance(to_field, models.OneToOneField):
-            field = self.get_one_to_one_field(to_field, other)
-        elif isinstance(to_field, models.AutoField):
-            field.__class__ = convert_auto_field(to_field)
-        else:
-            field.__class__ = to_field.__class__
-            excluded_prefixes = ("_", "__")
-            excluded_attributes = (
-                "rel",
-                "creation_counter",
-                "validators",
-                "error_messages",
-                "attname",
-                "column",
-                "help_text",
-                "name",
-                "model",
-                "unique_for_year",
-                "unique_for_date",
-                "unique_for_month",
-                "db_tablespace",
-                "db_index",
-                "db_column",
-                "default",
-                "auto_created",
-                "null",
-                "blank",
-            )
-            for key, val in to_field.__dict__.items():
-                if (isinstance(key, six.string_types)
-                        and not key.startswith(excluded_prefixes)
-                        and key not in excluded_attributes):
-                    setattr(field, key, val)
-        return field
-
-    def do_related_class(self, other, cls):
-        field = self.get_field(other, cls)
-        transform_field(field)
-        field.rel = None
-
-    def contribute_to_class(self, cls, name):
-        # HACK: remove annoying descriptor (don't super())
-        RelatedField.contribute_to_class(self, cls, name)
-
-
 def transform_field(field):
     """Customize field appropriately for use in historical model"""
     field.name = field.attname

tox.ini

@@ -1,9 +1,8 @@
 [tox]
 envlist =
-    py{26,27}-django14,
-    py{26,27,32,33}-django16,
-    py{27,32,33,34}-django17,
-    py{27,32,33,34,35}-django18,
+    py{27,33}-django16,
+    py{27,33,34}-django17,
+    py{27,33,34,35}-django18,
     py{27,34,35}-django19,
     py{27,34,35}-djangotrunk,
     docs, flake8
@@ -30,8 +29,6 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 [testenv]
 deps =
     coverage
-    py26: unittest2
-    django14: Django>=1.4,<1.5
     django16: Django>=1.6,<1.7
     django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9