Remove Django 1.6 / 1.7 compatibility code

makemessages.py

 #!/usr/bin/env python
 import os
-import django
 from os import path
 from django.conf import settings
 from django.core.management import call_command
@@ -16,9 +15,7 @@ def main():
             ),
         )
 
-    if django.VERSION >= (1,7):
     django.setup()
-
     makemessages()
 
 def makemessages():

private_storage/fields.py

@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 import logging
 import os
 
-import django
 from django.core.exceptions import ValidationError
 from django.core.files.uploadedfile import UploadedFile
 from django.db import models
@@ -36,8 +35,6 @@ class PrivateFileField(models.FileField):
         self.max_file_size = kwargs.pop("max_file_size", None)
 
         kwargs.setdefault('storage', private_storage)
-        if self._upload and django.VERSION < (1,7):
-            kwargs.setdefault('upload_to', 'uploads')  # shut up warnings from Django 1.6- model validation
         super(PrivateFileField, self).__init__(*args, **kwargs)
 
     def clean(self, *args, **kwargs):

runtests.py

 #!/usr/bin/env python
 import sys
-import django
 from django.conf import settings, global_settings as default_settings
 from django.core.management import execute_from_command_line
 from os import path
@@ -10,13 +9,22 @@ if not settings.configured:
 
     sys.path.insert(0, path.join(module_root, 'example'))
 
-    if django.VERSION >= (1, 8):
-        template_settings = dict(
+    settings.configure(
+        DEBUG = False,  # will be False anyway by DjangoTestRunner.
+        DATABASES = {
+            'default': {
+                'ENGINE': 'django.db.backends.sqlite3',
+                'NAME': ':memory:'
+            }
+        },
+        INSTALLED_APPS = (
+            'private_storage',
+        ),
+        TEST_RUNNER = 'django.test.runner.DiscoverRunner',
         TEMPLATES = [
             {
                 'BACKEND': 'django.template.backends.django.DjangoTemplates',
                 'DIRS': (),
-                    'DEBUG': True,
                 'OPTIONS': {
                     'loaders': (
                         'django.template.loaders.filesystem.Loader',
@@ -32,34 +40,8 @@ if not settings.configured:
                     ),
                 },
             },
-            ]
-        )
-    else:
-        template_settings = dict(
-            TEMPLATE_LOADERS = (
-                'django.template.loaders.app_directories.Loader',
-                'django.template.loaders.filesystem.Loader',
-            ),
-            TEMPLATE_CONTEXT_PROCESSORS = list(default_settings.TEMPLATE_CONTEXT_PROCESSORS) + [
-                'django.core.context_processors.request',
         ],
-            TEMPLATE_DEBUG = True,
-        )
-
-    settings.configure(
-        DEBUG = False,  # will be False anyway by DjangoTestRunner.
-        DATABASES = {
-            'default': {
-                'ENGINE': 'django.db.backends.sqlite3',
-                'NAME': ':memory:'
-            }
-        },
-        INSTALLED_APPS = (
-            'private_storage',
-        ),
-        TEST_RUNNER = 'django.test.runner.DiscoverRunner',
         AWS_PRIVATE_STORAGE_BUCKET_NAME='foobar',
-        **template_settings
     )
 
 

setup.py

@@ -71,12 +71,11 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Framework :: Django',
-        'Framework :: Django :: 1.6',
-        'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Application Frameworks',