Merge pull request #360 from treyhunner/remove-support-for-django-1.8

Removed Django 1.8 support

Author: Ross Mechanic

.travis.yml

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

CHANGES.rst

@@ -4,6 +4,7 @@ Changes
 Unreleased
 ----------
 - Fix bug where history_view ignored user permissions
+- Dropped support for Django<=1.8
 
 1.9.1 (2018-03-30)
 ------------------

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.8 or greater and Python 2.7, or 3.4 or greater.
+This app requires Django 1.9 or greater and Python 2.7, or 3.4 or greater.
 
 Getting Help
 ------------

runtests.py

@@ -6,6 +6,7 @@
 
 import django
 from django.conf import settings
+from django.test.runner import DiscoverRunner
 
 sys.path.insert(0, abspath(dirname(__file__)))
 
@@ -59,17 +60,9 @@ def main():
 
     if not settings.configured:
         settings.configure(**DEFAULT_SETTINGS)
-    if hasattr(django, 'setup'):
-        django.setup()
-    try:
-        from django.test.runner import DiscoverRunner
-    except ImportError:
-        from django.test.simple import DjangoTestSuiteRunner
-        failures = DjangoTestSuiteRunner(failfast=False).run_tests(['tests'])
-        failures |= DjangoTestSuiteRunner(failfast=False).run_tests(['registry_tests'])
-    else:
-        failures = DiscoverRunner(failfast=False).run_tests(['simple_history.tests'])
-        failures |= DiscoverRunner(failfast=False).run_tests(['simple_history.registry_tests'])
+    django.setup()
+    failures = DiscoverRunner(failfast=False).run_tests(['simple_history.tests'])
+    failures |= DiscoverRunner(failfast=False).run_tests(['simple_history.registry_tests'])
     sys.exit(failures)
 
 

setup.py

@@ -2,7 +2,7 @@
 import simple_history
 
 tests_require = [
-    'Django>=1.8', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
+    'Django>=1.9', '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.8",
         "Framework :: Django :: 1.9",
         "Framework :: Django :: 1.10",
         "Framework :: Django :: 1.11",

simple_history/admin.py

@@ -1,25 +1,19 @@
 from __future__ import unicode_literals
 
 from django import http
-from django.core.exceptions import PermissionDenied
+from django.conf import settings
 from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.admin import helpers
+from django.contrib.admin.utils import unquote
 from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404, render
-from django.utils.text import capfirst
+from django.utils.encoding import force_text
 from django.utils.html import mark_safe
+from django.utils.text import capfirst
 from django.utils.translation import ugettext as _
-from django.utils.encoding import force_text
-from django.conf import settings
-from django.contrib.admin.utils import unquote
-
-try:
-    from django.utils.version import get_complete_version
-except ImportError:
-    from django import VERSION
-    get_complete_version = lambda: VERSION
 
 USER_NATURAL_KEY = tuple(
     key.lower() for key in settings.AUTH_USER_MODEL.split('.', 1))
@@ -84,8 +78,6 @@ def history_view(self, request, object_id, extra_context=None):
         }
         context.update(extra_context or {})
         extra_kwargs = {}
-        if get_complete_version() < (1, 8):
-            extra_kwargs['current_app'] = request.current_app
         return render(request, self.object_history_template, context, **extra_kwargs)
 
     def response_change(self, request, obj):
@@ -189,8 +181,6 @@ def history_form_view(self, request, object_id, version_id):
             'root_path': getattr(self.admin_site, 'root_path', None),
         }
         extra_kwargs = {}
-        if get_complete_version() < (1, 8):
-            extra_kwargs['current_app'] = request.current_app
         return render(request, self.object_history_form_template, context, **extra_kwargs)
 
     def save_model(self, request, obj, form, change):

simple_history/management/commands/populate_history.py

@@ -1,12 +1,10 @@
-from optparse import make_option
-
-from django.core.management.base import BaseCommand, CommandError
 from django.apps import apps
+from django.core.management.base import BaseCommand, CommandError
 
-get_model = apps.get_model
-
-from ... import models
 from . import _populate_utils as utils
+from ... import models
+
+get_model = apps.get_model
 
 
 class Command(BaseCommand):
@@ -23,12 +21,6 @@ class Command(BaseCommand):
     EXISTING_HISTORY_FOUND = "Existing history found, skipping model"
     INVALID_MODEL_ARG = "An invalid model was specified"
 
-    if hasattr(BaseCommand, 'option_list'):  # Django < 1.8
-        option_list = BaseCommand.option_list + (
-            make_option('--auto', action='store_true', dest='auto', default=False),
-            make_option('--batchsize', action='store', dest='batchsize', default=200, type=int),
-        )
-
     def add_arguments(self, parser):
         super(Command, self).add_arguments(parser)
         parser.add_argument('models', nargs='*', type=str)

simple_history/manager.py

@@ -33,8 +33,6 @@ def get_queryset(self):
             key_name = self.instance._meta.pk.name
         return self.get_super_queryset().filter(**{key_name: self.instance.pk})
 
-    get_query_set = get_queryset
-
     def most_recent(self):
         """
         Returns the most recent copy of the instance available in the history.

simple_history/tests/models.py

@@ -1,19 +1,15 @@
 from __future__ import unicode_literals
 
+from django.apps import apps
 from django.db import models
-from django import VERSION
 
-from simple_history.models import HistoricalRecords
 from simple_history import register
-
+from simple_history.models import HistoricalRecords
 from .custom_user.models import CustomUser as User
-
-from django.apps import apps
+from .external.models.model1 import AbstractExternal
 
 get_model = apps.get_model
 
-from .external.models.model1 import AbstractExternal
-
 
 class Poll(models.Model):
     question = models.CharField(max_length=200)
@@ -85,6 +81,7 @@ def verbose_str(self):
         extra_fields['__str__'] = verbose_str
         return extra_fields
 
+
 register(Voter, records_class=HistoricalRecordsVerbose)
 
 

simple_history/tests/tests/test_admin.py

@@ -1,29 +1,25 @@
 from datetime import datetime, timedelta
 
-from mock import patch, ANY
-from django_webtest import WebTest
+from django.conf import settings
 from django.contrib.admin import AdminSite
 from django.contrib.admin.utils import quote
+from django.contrib.auth import get_user_model
 from django.contrib.messages.storage.fallback import FallbackStorage
-from django.test.utils import override_settings
-from django.test.client import RequestFactory
 from django.core.urlresolvers import reverse
-from django.conf import settings
-from django.contrib.auth import get_user_model
+from django.test.client import RequestFactory
+from django.test.utils import override_settings
 from django.utils.encoding import force_text
+from django_webtest import WebTest
+from mock import ANY, patch
 
+from simple_history.admin import SimpleHistoryAdmin
 from simple_history.models import HistoricalRecords
-from simple_history.admin import SimpleHistoryAdmin, get_complete_version
-from ..models import Book, Person, Poll, State, Employee, Choice, ConcreteExternal
+from ..models import Book, Choice, ConcreteExternal, Employee, Person, Poll, State
 
 User = get_user_model()
 today = datetime(2021, 1, 1, 10, 0)
 tomorrow = today + timedelta(days=1)
 
-extra_kwargs = {}
-if get_complete_version() < (1, 8):
-    extra_kwargs = {'current_app': 'admin'}
-
 
 def get_history_url(obj, history_index=None, site="admin"):
     app, model = obj._meta.app_label, obj._meta.model_name
@@ -442,7 +438,7 @@ def test_history_form_view_without_getting_history(self):
             'root_path': getattr(admin_site, 'root_path', None),
         }
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context, **extra_kwargs)
+            request, admin.object_history_form_template, context)
 
     def test_history_form_view_getting_history(self):
         request = RequestFactory().post('/')
@@ -497,7 +493,7 @@ def test_history_form_view_getting_history(self):
             'root_path': getattr(admin_site, 'root_path', None),
         }
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context, **extra_kwargs)
+            request, admin.object_history_form_template, context)
 
     def test_history_form_view_getting_history_with_setting_off(self):
         request = RequestFactory().post('/')
@@ -551,7 +547,7 @@ def test_history_form_view_getting_history_with_setting_off(self):
             'root_path': getattr(admin_site, 'root_path', None),
         }
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context, **extra_kwargs)
+            request, admin.object_history_form_template, context)
 
     def test_history_form_view_getting_history_abstract_external(self):
         request = RequestFactory().post('/')
@@ -606,4 +602,4 @@ def test_history_form_view_getting_history_abstract_external(self):
             'root_path': getattr(admin_site, 'root_path', None),
         }
         mock_render.assert_called_once_with(
-            request, admin.object_history_form_template, context, **extra_kwargs)
+            request, admin.object_history_form_template, context)