Drop support for Django < 1.11 and remove workarounds

.travis.yml

@@ -5,19 +5,10 @@ python:
 - '3.5'
 - '3.6'
 env:
-- DJANGO="Django>=1.8.0,<1.9.0"   DB=postgresql DB_NAME=travis_ci_test
-- DJANGO="Django>=1.9.0,<1.10.0"  DB=postgresql DB_NAME=travis_ci_test
-- DJANGO="Django>=1.10.0,<1.11.0" DB=postgresql DB_NAME=travis_ci_test
 - DJANGO="Django>=1.11.0,<2.0"    DB=postgresql DB_NAME=travis_ci_test
 - DJANGO="Django>=2.0,<2.1.0"     DB=postgresql DB_NAME=travis_ci_test
-- DJANGO="Django>=1.8.0,<1.9.0"   DB=sqlite3 DB_NAME=db.sqlite3
-- DJANGO="Django>=1.9.0,<1.10.0"  DB=sqlite3 DB_NAME=db.sqlite3
-- DJANGO="Django>=1.10.0,<1.11.0" DB=sqlite3 DB_NAME=db.sqlite3
 - DJANGO="Django>=1.11.0,<2.0"    DB=sqlite3 DB_NAME=db.sqlite3
 - DJANGO="Django>=2.0,<2.1.0"     DB=sqlite3 DB_NAME=db.sqlite3
-- DJANGO="Django>=1.8.0,<1.9.0"   DB=mysql DB_NAME=mysql_db
-- DJANGO="Django>=1.9.0,<1.10.0"  DB=mysql DB_NAME=mysql_db
-- DJANGO="Django>=1.10.0,<1.11.0" DB=mysql DB_NAME=mysql_db
 - DJANGO="Django>=1.11.0,<2.0"    DB=mysql DB_NAME=mysql_db
 - DJANGO="Django>=2.0,<2.1.0"     DB=mysql DB_NAME=mysql_db
 matrix:

README.md

@@ -32,8 +32,8 @@ Silk is a live profiling and inspection tool for the Django framework. Silk inte
 
 Silk has been tested with:
 
-* Django: 1.8, 1.9, 1.10, 1.11, 2.0
-* Python: 2.7, 3.3, 3.4, 3.5, 3.6
+* Django: 1.11, 2.0
+* Python: 2.7, 3.4, 3.5, 3.6
 
 
 ## Installation
@@ -47,21 +47,12 @@ pip install django-silk
 In `settings.py` add the following:
 
 ```python
-# Django >= 1.10
 MIDDLEWARE = [
     ...
     'silk.middleware.SilkyMiddleware',
     ...
 ]
 
-# Django <= 1.9
-MIDDLEWARE_CLASSES = (
-    ...
-    'silk.middleware.SilkyMiddleware',
-    ...
-)
-
-# All versions of django
 INSTALLED_APPS = (
     ...
     'silk'

docs/index.rst

@@ -57,5 +57,5 @@ Features
 Requirements
 ------------
 
-* Django: 1.8, 1.9, 1.10, 1.11, 2.0
-* Python: 2.7, 3.3, 3.4, 3.5, 3.6
+* Django: 1.11, 2.0
+* Python: 2.7, 3.4, 3.5, 3.6

docs/quickstart.rst

@@ -13,21 +13,12 @@ Add the following to your ``settings.py``:
 
 .. code-block:: python
 
-	# Django >= 1.10
 	MIDDLEWARE = [
 	    ...
 	    'silk.middleware.SilkyMiddleware',
 	    ...
 	]
 
-	# Django <= 1.9
-	MIDDLEWARE_CLASSES = ( 
-	    ...
-	    'silk.middleware.SilkyMiddleware',
-	    ...
-	)
-
-	# All versions of Django
 	INSTALLED_APPS = (
 	    ...
 	    'silk'

project/example_app/admin.py

@@ -1,10 +1,5 @@
 from django.contrib import admin
-try:
-    # Django >= 1.10
-    from django.urls import reverse
-except ImportError:
-    # Django < 2.0
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
 from .models import Blind
 
 

project/project/settings.py

@@ -1,4 +1,3 @@
-import django
 import os
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
@@ -23,26 +22,15 @@
 
 ROOT_URLCONF = 'project.urls'
 
-if django.VERSION >= (1, 10):
-    MIDDLEWARE = [
-        'django.contrib.sessions.middleware.SessionMiddleware',
-        'django.middleware.common.CommonMiddleware',
-        'django.middleware.csrf.CsrfViewMiddleware',
-        'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.contrib.messages.middleware.MessageMiddleware',
-        'django.middleware.clickjacking.XFrameOptionsMiddleware',
-        'silk.middleware.SilkyMiddleware'
-    ]
-else:
-    MIDDLEWARE_CLASSES = (
-        'django.contrib.sessions.middleware.SessionMiddleware',
-        'django.middleware.common.CommonMiddleware',
-        'django.middleware.csrf.CsrfViewMiddleware',
-        'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.contrib.messages.middleware.MessageMiddleware',
-        'django.middleware.clickjacking.XFrameOptionsMiddleware',
-        'silk.middleware.SilkyMiddleware'
-    )
+MIDDLEWARE = [
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'silk.middleware.SilkyMiddleware'
+]
 
 WSGI_APPLICATION = 'wsgi.application'
 

project/tests/test_config_auth.py

@@ -1,10 +1,5 @@
 from django.contrib.auth.models import User
-try:
-    # Django >= 1.10
-    from django.urls import reverse, NoReverseMatch
-except ImportError:
-    # Django < 2.0
-    from django.core.urlresolvers import reverse, NoReverseMatch
+from django.urls import reverse, NoReverseMatch
 from django.test import TestCase
 
 from silk.config import SilkyConfig, default_permissions

project/tests/test_config_max_body_size.py

@@ -1,9 +1,4 @@
-try:
-    # Django >= 1.10
-    from django.urls import reverse
-except ImportError:
-    # Django < 2.0
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from mock import Mock
 from silk.model_factory import RequestModelFactory, ResponseModelFactory

project/tests/test_end_points.py

@@ -1,10 +1,5 @@
 import random
-try:
-    # Django >= 1.10
-    from django.urls import reverse
-except ImportError:
-    # Django < 2.0
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Count
 
 from django.test import TestCase

project/tests/test_lib/mock_suite.py

@@ -5,7 +5,6 @@
 import random
 import traceback
 
-import django
 from django.core import management
 from django.utils import timezone
 
@@ -101,11 +100,7 @@ def mock_sql_queries(self, request=None, profile=None, n=1, as_dict=False):
                 for q in queries:
                     profile['queries'].append(q)
             else:
-                if django.VERSION >= (1, 9):
-                    profile.queries.set(queries)
-                else:
-                    profile.queries = queries
-                profile.save()
+                profile.queries.set(queries)
         return queries
 
     def mock_profile(self, request=None):

project/tests/test_silky_middleware.py

@@ -1,9 +1,4 @@
-try:
-    # Django >= 1.10
-    from django.urls import reverse
-except ImportError:
-    # Django < 2.0
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from mock import patch, Mock
 

project/tests/test_view_sql_detail.py

@@ -1,12 +1,7 @@
 import os
 import random
 
-try:
-    # Django >= 1.10
-    from django.urls import reverse
-except ImportError:
-    # Django < 2.0
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.test import TestCase
 from silk.config import SilkyConfig
 from silk.middleware import silky_reverse

requirements.txt

@@ -7,7 +7,7 @@ autopep8>=1.2.1
 pytz>2014.2
 mock>=1.0.1
 Pillow>=3.2
-django>=1.8
+Django>=1.11
 freezegun>=0.3
 factory-boy>=2.8.1
-gprof2dot>=2016.10.13,<2017.09.19
+gprof2dot>=2016.10.13,<2017.09.19

setup.py

@@ -33,18 +33,22 @@ def read_md(f):
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Framework :: Django',
+        'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],
     install_requires=[
-        'Django',
+        'Django>=1.11',
         'Pygments',
         'python-dateutil',
         'requests',

silk/middleware.py

@@ -2,15 +2,10 @@
 import random
 
 from django.db import transaction, DatabaseError
-try:
-    # Django >= 1.10
-    from django.urls import reverse, NoReverseMatch
-except ImportError:
-    # Django < 2.0
-    from django.core.urlresolvers import reverse, NoReverseMatch
-
+from django.urls import reverse, NoReverseMatch
 from django.db.models.sql.compiler import SQLCompiler
 from django.utils import timezone
+from django.utils.deprecation import MiddlewareMixin
 
 from silk.collector import DataCollector
 
@@ -20,13 +15,6 @@
 from silk.profiling.profiler import silk_meta_profiler
 from silk.sql import execute_sql
 
-try:
-    from django.utils.deprecation import MiddlewareMixin
-except ImportError:  # Django < 1.10
-    # Works perfectly for everyone using MIDDLEWARE_CLASSES
-    MiddlewareMixin = object
-
-
 Logger = logging.getLogger('silk.middleware')
 
 

silk/model_factory.py

@@ -6,12 +6,7 @@
 from uuid import UUID
 
 from django.utils.encoding import force_text
-try:
-    # Django >= 1.10
-    from django.urls import resolve, Resolver404
-except ImportError:
-    # Django < 2.0
-    from django.core.urlresolvers import resolve, Resolver404
+from django.urls import resolve, Resolver404
 
 from silk import models
 from silk.collector import DataCollector

silk/profiling/profiler.py

@@ -3,7 +3,6 @@
 import time
 import traceback
 
-import django
 from django.conf import settings
 from django.utils import timezone
 
@@ -126,8 +125,6 @@ def __exit__(self, exc_type, exc_val, exc_tb):
     def _silk_installed(self):
         app_installed = 'silk' in settings.INSTALLED_APPS
         middlewares = getattr(settings, 'MIDDLEWARE', [])
-        if django.VERSION[0] < 2 and not middlewares:
-            middlewares = getattr(settings, 'MIDDLEWARE_CLASSES', [])
         if not middlewares:
             middlewares = []
         middleware_installed = 'silk.middleware.SilkyMiddleware' in middlewares

silk/templatetags/silk_nav.py

@@ -1,10 +1,5 @@
 from django import template
-try:
-    # Django >= 1.10
-    from django.urls import reverse
-except ImportError:
-    # Django < 2.0
-    from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 register = template.Library()
 

silk/views/profiling.py

@@ -1,7 +1,4 @@
-try:
-    from django.template.context_processors import csrf
-except ImportError:
-    from django.core.context_processors import csrf
+from django.template.context_processors import csrf
 from django.db.models import Count, Sum
 from django.shortcuts import render
 from django.utils.decorators import method_decorator