Merge pull request #362 from treyhunner/remove-support-for-django-1.9

Removed support for Django 1.9

Author: Ross Mechanic

.travis.yml

@@ -9,7 +9,6 @@ python:
   - 3.6
 
 env:
-  - DJANGO="Django>=1.9,<1.10"
   - DJANGO="Django>=1.10,<1.11"
   - DJANGO="Django>=1.11,<1.12"
 

CHANGES.rst

@@ -3,8 +3,8 @@ Changes
 
 Unreleased
 ----------
-- Fix bug where history_view ignored user permissions
-- Dropped support for Django<=1.8
+- Dropped support for Django<=1.9 (gh-356)
+- Fix bug where history_view ignored user permissions (gh-361)
 
 1.9.1 (2018-03-30)
 ------------------

README.rst

@@ -20,7 +20,9 @@ django-simple-history
 
 django-simple-history stores Django model state on every create/update/delete.
 
-This app requires Django 1.9 or greater and Python 2.7, or 3.4 or greater.
+This app requires Django 1.10 and 1.11 and Python 2.7, or 3.4 or greater.
+However, the most recent release (1.9.1) supports Django>=1.7,<2.0. The next
+release will include Django 2.0 support.
 
 Getting Help
 ------------

setup.py

@@ -2,7 +2,7 @@
 import simple_history
 
 tests_require = [
-    'Django>=1.9', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
+    'Django>=1.10', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
 
 setup(
     name='django-simple-history',
@@ -25,7 +25,6 @@
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
         "Framework :: Django",
-        "Framework :: Django :: 1.9",
         "Framework :: Django :: 1.10",
         "Framework :: Django :: 1.11",
         "Programming Language :: Python",

simple_history/middleware.py

@@ -1,9 +1,6 @@
-from . models import HistoricalRecords
+from django.utils.deprecation import MiddlewareMixin as MiddlewareBase
 
-try:
-    from django.utils.deprecation import MiddlewareMixin as MiddlewareBase
-except ImportError:  # Django < 1.10
-    MiddlewareBase = object
+from .models import HistoricalRecords
 
 
 class HistoryRequestMiddleware(MiddlewareBase):

simple_history/models.py

@@ -25,7 +25,6 @@
     add_introspection_rules(
         [], ["^simple_history.models.CustomForeignKeyField"])
 
-
 registered_models = {}
 
 
@@ -69,6 +68,7 @@ def save_without_historical_record(self, *args, **kwargs):
             finally:
                 del self.skip_history_when_saving
             return ret
+
         setattr(cls, 'save_without_historical_record',
                 save_without_historical_record)
 
@@ -156,18 +156,15 @@ def copy_fields(self, model):
         fields = {}
         for field in self.fields_included(model):
             field = copy.copy(field)
-            try:
-                field.remote_field = copy.copy(field.remote_field)
-            except AttributeError:
-                field.rel = copy.copy(field.rel)
+            field.remote_field = copy.copy(field.remote_field)
             if isinstance(field, OrderWrt):
                 # OrderWrt is a proxy field, switch to a plain IntegerField
                 field.__class__ = models.IntegerField
             if isinstance(field, models.ForeignKey):
                 old_field = field
                 field_arguments = {'db_constraint': False}
                 if (getattr(old_field, 'one_to_one', False) or
-                        isinstance(old_field, models.OneToOneField)):
+                    isinstance(old_field, models.OneToOneField)):
                     FieldType = models.ForeignKey
                 else:
                     FieldType = type(old_field)
@@ -176,13 +173,15 @@ def copy_fields(self, model):
                 if getattr(old_field, 'db_column', None):
                     field_arguments['db_column'] = old_field.db_column
 
-                # If old_field.rel.to is 'self' then we have a case where object has a foreign key
-                # to itself. In this case we update need to set the `to` value of the field
-                # to be set to a model. We can use the old_field.model value.
-                if isinstance(old_field.rel.to, str) and old_field.rel.to == 'self':
+                # If old_field.remote_field.model is 'self' then we have a
+                # case where object has a foreign key to itself. In this case
+                # we need to set the `model` value of the field to a model. We
+                # can use the old_field.model value.
+                if isinstance(old_field.remote_field.model, str) and \
+                    old_field.remote_field.model == 'self':
                     object_to = old_field.model
                 else:
-                    object_to = old_field.rel.to
+                    object_to = old_field.remote_field.model
 
                 field = FieldType(
                     object_to,

simple_history/registry_tests/migration_test_app/models.py

@@ -11,5 +11,5 @@ class WhatIMean(DoYouKnow):
 
 
 class Yar(models.Model):
-    what = models.ForeignKey(WhatIMean)
+    what = models.ForeignKey(WhatIMean, on_delete=models.CASCADE)
     history = HistoricalRecords()

simple_history/tests/models.py

@@ -255,7 +255,7 @@ class Meta:
 
 
 class PollInfo(models.Model):
-    poll = models.ForeignKey(
+    poll = models.OneToOneField(
         Poll,
         on_delete=models.CASCADE,
         primary_key=True,
@@ -272,7 +272,8 @@ class UserAccessorOverride(models.Model):
 
 
 class Employee(models.Model):
-    manager = models.OneToOneField('Employee', null=True)
+    manager = models.OneToOneField('Employee', null=True,
+                                   on_delete=models.CASCADE)
     history = HistoricalRecords()
 
 

simple_history/tests/tests/test_models.py

@@ -184,7 +184,7 @@ def test_foreignkey_still_allows_reverse_lookup_via_set_attribute(self):
         lib = Library.objects.create()
         state = State.objects.create(library=lib)
         self.assertTrue(hasattr(lib, 'state_set'))
-        self.assertIsNone(state._meta.get_field('library').rel.related_name,
+        self.assertIsNone(state._meta.get_field('library').remote_field.related_name,
                           "the '+' shouldn't leak through to the original "
                           "model's field related_name")
 
@@ -519,12 +519,12 @@ def test_invalid_bases(self):
 
     def test_import_related(self):
         field_object = HistoricalChoice._meta.get_field('poll')
-        related_model = field_object.rel.related_model
+        related_model = field_object.remote_field.related_model
         self.assertEqual(related_model, HistoricalChoice)
 
     def test_string_related(self):
         field_object = HistoricalState._meta.get_field('library')
-        related_model = field_object.rel.related_model
+        related_model = field_object.remote_field.related_model
         self.assertEqual(related_model, HistoricalState)
 
     def test_state_serialization_of_customfk(self):

simple_history/tests/urls.py

@@ -1,12 +1,13 @@
 from __future__ import unicode_literals
 
-from django.conf.urls import include, url
+from django.conf.urls import url
 from django.contrib import admin
+
 from . import other_admin
 
 admin.autodiscover()
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
-    url(r'^other-admin/', include(other_admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
+    url(r'^other-admin/', other_admin.site.urls),
 ]