Drop EOL Django 1.6 and Python 3.3

Author: hugovk

.travis.yml

@@ -4,13 +4,11 @@ sudo: false
 
 python:
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
   - 3.6
 
 env:
-  - DJANGO="Django>=1.6,<1.7"
   - DJANGO="Django>=1.7,<1.8"
   - DJANGO="Django>=1.8,<1.9"
   - DJANGO="Django>=1.9,<1.10"
@@ -26,21 +24,9 @@ script: coverage run setup.py test
 
 matrix:
   exclude:
-   - python: 3.4
-     env: DJANGO="Django>=1.6,<1.7"
-   - python: 3.5
-     env: DJANGO="Django>=1.6,<1.7"
    - python: 3.5
      env: DJANGO="Django>=1.7,<1.8"
-   - python: 3.6
-     env: DJANGO="Django>=1.6,<1.7"
    - python: 3.6
      env: DJANGO="Django>=1.7,<1.8"
-   - python: 3.3
-     env: DJANGO="Django>=1.9,<1.10"
-   - python: 3.3
-     env: DJANGO="Django>=1.10,<1.11"
-   - python: 3.3
-     env: DJANGO="Django>=1.11,<1.12"
 
 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.6 or greater and Python 2.7, 3.3, or greater.
+This app requires Django 1.7 or greater and Python 2.7, or 3.4 or greater.
 
 Getting Help
 ------------

setup.py

@@ -2,7 +2,7 @@
 import simple_history
 
 tests_require = [
-    'Django>=1.6', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
+    'Django>=1.7', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
 
 setup(
     name='django-simple-history',
@@ -27,13 +27,12 @@
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         "License :: OSI Approved :: BSD License",
     ],
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
     tests_require=tests_require,
     include_package_data=True,
     test_suite='runtests.main',

simple_history/admin.py

@@ -13,11 +13,8 @@
 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.contrib.admin.utils import unquote
-except ImportError:  # Django < 1.7
-    from django.contrib.admin.util import unquote
 try:
     from django.utils.version import get_complete_version
 except ImportError:

simple_history/management/commands/populate_history.py

@@ -1,13 +1,9 @@
 from optparse import make_option
 
 from django.core.management.base import BaseCommand, CommandError
+from django.apps import apps
 
-try:
-    from django.apps import apps
-except ImportError:  # Django < 1.7
-    from django.db.models.loading import get_model
-else:
-    get_model = apps.get_model
+get_model = apps.get_model
 
 from ... import models
 from . import _populate_utils as utils

simple_history/models.py

@@ -4,6 +4,7 @@
 import importlib
 import threading
 
+from django.apps import apps
 from django.conf import settings
 from django.contrib import admin
 from django.db import models, router
@@ -16,10 +17,6 @@
 from . import exceptions
 from .manager import HistoryDescriptor
 
-try:
-    from django.apps import apps
-except ImportError:  # Django < 1.7
-    from django.db.models import get_app
 try:
     from south.modelsinspector import add_introspection_rules
 except ImportError:  # south not present

simple_history/registry_tests/tests.py

@@ -17,13 +17,9 @@
                             TrackedWithConcreteBase, UserAccessorDefault,
                             UserAccessorOverride, Voter)
 
-try:
-    from django.apps import apps
-except ImportError:  # Django < 1.7
-    from django.db.models import get_model
-else:
-    get_model = apps.get_model
+from django.apps import apps
 
+get_model = apps.get_model
 User = get_user_model()
 today = datetime(2021, 1, 1, 10, 0)
 tomorrow = today + timedelta(days=1)
@@ -144,7 +140,6 @@ def test_registering_with_tracked_abstract_base(self):
             register(InheritTracking4)
 
 
-@unittest.skipUnless(django.get_version() >= "1.7", "Requires 1.7 migrations")
 class TestMigrate(TestCase):
 
     def test_makemigration_command(self):

simple_history/tests/models.py

@@ -8,23 +8,11 @@
 
 from .custom_user.models import CustomUser as User
 
-try:
-    from django.apps import apps
-except ImportError:  # Django < 1.7
-    from django.db.models import get_model
-else:
-    get_model = apps.get_model
-
-# 1.6 has different way of importing models
-if VERSION[:3] >= (1, 7, 0):
-    from .external.models.model1 import AbstractExternal
-else:
-    class AbstractExternal(models.Model):
-        history = HistoricalRecords(inherit=True)
-
-        class Meta:
-            abstract = True
-            app_label = 'external'
+from django.apps import apps
+
+get_model = apps.get_model
+
+from .external.models.model1 import AbstractExternal
 
 
 class Poll(models.Model):

simple_history/tests/tests/test_admin.py

@@ -3,6 +3,7 @@
 from mock import patch, ANY
 from django_webtest import WebTest
 from django.contrib.admin import AdminSite
+from django.contrib.admin.utils import quote
 from django.contrib.messages.storage.fallback import FallbackStorage
 from django.test.utils import override_settings
 from django.test.client import RequestFactory
@@ -15,11 +16,6 @@
 from simple_history.admin import SimpleHistoryAdmin, get_complete_version
 from ..models import Book, Person, Poll, State, Employee, Choice, ConcreteExternal
 
-try:
-    from django.contrib.admin.utils import quote
-except ImportError:  # Django < 1.7
-    from django.contrib.admin.util import quote
-
 User = get_user_model()
 today = datetime(2021, 1, 1, 10, 0)
 tomorrow = today + timedelta(days=1)

simple_history/tests/tests/test_models.py

@@ -23,14 +23,9 @@
                       PollWithExcludeFields, Province, Restaurant, SelfFK,
                       Series, SeriesWork, State, Temperature,
                       UnicodeVerboseName, WaterLevel)
+from django.apps import apps
 
-try:
-    from django.apps import apps
-except ImportError:  # Django < 1.7
-    from django.db.models import get_model
-else:
-    get_model = apps.get_model
-
+get_model = apps.get_model
 User = get_user_model()
 today = datetime(2021, 1, 1, 10, 0)
 tomorrow = today + timedelta(days=1)
@@ -528,8 +523,6 @@ def test_string_related(self):
             related_model = field_object.related.model
         self.assertEqual(related_model, HistoricalState)
 
-    @unittest.skipUnless(django.get_version() >= "1.7",
-                         "Requires 1.7 migrations")
     def test_state_serialization_of_customfk(self):
         from django.db.migrations import state
         state.ModelState.from_model(HistoricalCustomFKError)
@@ -681,8 +674,6 @@ def test_restore_object_with_changed_order(self):
         self.assertEqual(order[5], self.w_chair.pk)
         self.assertEqual(order[6], self.w_battle.pk)
 
-    @unittest.skipUnless(django.get_version() >= "1.7",
-                         "Requires 1.7 migrations")
     def test_migrations_include_order(self):
         from django.db.migrations import state
         model_state = state.ModelState.from_model(SeriesWork.history.model)