Remove Django 1.7, 1.8, 1.9, 1.10 compatibility code

Author: vdboor

.travis.yml

@@ -3,23 +3,19 @@ language: python
 cache: pip
 python:
   - "2.7"
-  - "3.4"
   - "3.6"
 env:
-  - PACKAGES="Django>=1.7,<1.8 django-contrib-comments<1.8"
-  - PACKAGES="Django>=1.8,<1.9"
-  - PACKAGES="Django>=1.9,<1.10"
-  - PACKAGES="Django>=1.10,<1.11"
   - PACKAGES="Django>=1.11,<1.12"
   - PACKAGES="Django>=2.0,<2.1"
+  - PACKAGES="Django>=2.1,<2.2"
 matrix:
   exclude:
-  - python: '3.6'
-    env: PACKAGES="Django>=1.7,<1.8 django-contrib-comments<1.8"
   - python: '2.7'
     env: PACKAGES="Django>=2.0,<2.1"
+  - python: '2.7'
+    env: PACKAGES="Django>=2.1,<2.2"
   allow_failure:
-    - env: PACKAGES="Django>=2.0,<2.1"
+    - env: PACKAGES="Django>=2.1,<2.2"
 
 before_install:
   - pip install codecov

runtests.py

@@ -15,54 +15,24 @@
 )
 
 if not settings.configured:
-    if django.VERSION >= (1,8):
-        base_app = 'django_comments'
-
-        versioned_settings = dict(
-            TEMPLATES = [
-                {
-                    'BACKEND': 'django.template.backends.django.DjangoTemplates',
-                    'APP_DIRS': True,
-                    'OPTIONS': {
-                        'context_processors': [
-                            'django.contrib.auth.context_processors.auth',
-                            'django.template.context_processors.request',
-                            'django.template.context_processors.static',
-                            'django.contrib.messages.context_processors.messages',
-                        ]
-                    },
-                },
-            ]
-        )
-    else:
-        base_app = 'django.contrib.comments'
-        versioned_settings = dict(
-            TEMPLATE_LOADERS = (
-                'django.template.loaders.app_directories.Loader',
-            ),
-            TEMPLATE_CONTEXT_PROCESSORS = list(default_settings.TEMPLATE_CONTEXT_PROCESSORS) + [
-                'django.core.context_processors.request',
-            ],
-        )
-
     if django.VERSION >= (2, 0):
-        versioned_settings.update(dict(
+        versioned_settings = dict(
             MIDDLEWARE = (
                 'django.middleware.common.CommonMiddleware',
                 'django.contrib.sessions.middleware.SessionMiddleware',
                 'django.middleware.csrf.CsrfViewMiddleware',
                 'django.contrib.auth.middleware.AuthenticationMiddleware',
             )
-        ))
+        )
     else:
-        versioned_settings.update(dict(
+        versioned_settings = dict(
             MIDDLEWARE_CLASSES = (
                 'django.middleware.common.CommonMiddleware',
                 'django.contrib.sessions.middleware.SessionMiddleware',
                 'django.middleware.csrf.CsrfViewMiddleware',
                 'django.contrib.auth.middleware.AuthenticationMiddleware',
             )
-        ))
+        )
 
     settings.configure(
         DATABASES = {
@@ -76,19 +46,31 @@
             'django.contrib.messages',
             'django.contrib.sites',
             'django.contrib.admin',
-            base_app,
+            'django_comments',
             'threadedcomments',
         ),
-        ROOT_URLCONF = '{0}.urls'.format(base_app),
-        TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner' if django.VERSION < (1,6) else 'django.test.runner.DiscoverRunner',
+        TEMPLATES = [
+            {
+                'BACKEND': 'django.template.backends.django.DjangoTemplates',
+                'APP_DIRS': True,
+                'OPTIONS': {
+                    'context_processors': [
+                        'django.contrib.auth.context_processors.auth',
+                        'django.template.context_processors.request',
+                        'django.template.context_processors.static',
+                        'django.contrib.messages.context_processors.messages',
+                    ]
+                },
+            },
+        ],
+        ROOT_URLCONF = 'django_comments.urls',
+        TEST_RUNNER = 'django.test.runner.DiscoverRunner',
         SITE_ID = 1,
         COMMENTS_APP = 'threadedcomments',
         COMMENTS_ALLOW_PROFANITIES = True,
         **versioned_settings
     )
 
-    sys.stderr.write('Using comments app {0} from {1}\n'.format(base_app, path.dirname(import_module(base_app).__file__)))
-
 def runtests():
     argv = sys.argv[:1] + ['test', 'threadedcomments', '--traceback'] + sys.argv[1:]
     execute_from_command_line(argv)

setup.py

@@ -38,7 +38,7 @@ def find_version(*parts):
     version=find_version('threadedcomments', '__init__.py'),
     license='BSD',
     install_requires=[
-        'django-contrib-comments>=1.7.3',
+        'django-contrib-comments>=1.9.0',
     ],
 
     description='A simple yet flexible threaded commenting system.',
@@ -74,12 +74,9 @@ def find_version(*parts):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Framework :: Django',
-        'Framework :: Django :: 1.7',
-        'Framework :: Django :: 1.8',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 2.1',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules',

threadedcomments/admin.py

@@ -1,21 +1,9 @@
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
+from django_comments.admin import CommentsAdmin
 
-from .compat import BASE_APP
 from .models import ThreadedComment
 
-# This code is not in the .compat module to avoid admin imports in all other code.
-# The admin import usually starts a model registration too, hence keep these imports here.
-
-if BASE_APP == 'django.contrib.comments':
-    # Django 1.7 and below
-    from django.contrib.comments.admin import CommentsAdmin
-elif BASE_APP == 'django_comments':
-    # Django 1.8 and up
-    from django_comments.admin import CommentsAdmin
-else:
-    raise NotImplementedError()
-
 
 class ThreadedCommentsAdmin(CommentsAdmin):
     fieldsets = (