run tests on Django 2.0

Author: vdboor

.travis.yml

@@ -4,16 +4,22 @@ cache: pip
 python:
   - "2.7"
   - "3.4"
-  - "3.5"
+  - "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"
 matrix:
   exclude:
-  - python: '3.5'
+  - 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"
+  allow_failure:
+    - env: PACKAGES="Django>=2.0,<2.1"
 
 before_install:
   - pip install codecov

examples/example/settings.py

@@ -91,6 +91,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
 )
+MIDDLEWARE = MIDDLEWARE_CLASSES  # Django 2.0
 
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',

runtests.py

@@ -18,7 +18,7 @@
     if django.VERSION >= (1,8):
         base_app = 'django_comments'
 
-        template_settings = dict(
+        versioned_settings = dict(
             TEMPLATES = [
                 {
                     'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -36,7 +36,7 @@
         )
     else:
         base_app = 'django.contrib.comments'
-        template_settings = dict(
+        versioned_settings = dict(
             TEMPLATE_LOADERS = (
                 'django.template.loaders.app_directories.Loader',
             ),
@@ -45,6 +45,25 @@
             ],
         )
 
+    if django.VERSION >= (2, 0):
+        versioned_settings.update(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(
+            MIDDLEWARE_CLASSES = (
+                'django.middleware.common.CommonMiddleware',
+                'django.contrib.sessions.middleware.SessionMiddleware',
+                'django.middleware.csrf.CsrfViewMiddleware',
+                'django.contrib.auth.middleware.AuthenticationMiddleware',
+            )
+        ))
+
     settings.configure(
         DATABASES = {
             'default': {
@@ -60,18 +79,12 @@
             base_app,
             'threadedcomments',
         ),
-        MIDDLEWARE_CLASSES = (
-            'django.middleware.common.CommonMiddleware',
-            'django.contrib.sessions.middleware.SessionMiddleware',
-            'django.middleware.csrf.CsrfViewMiddleware',
-            'django.contrib.auth.middleware.AuthenticationMiddleware',
-        ),
         ROOT_URLCONF = '{0}.urls'.format(base_app),
         TEST_RUNNER = 'django.test.simple.DjangoTestSuiteRunner' if django.VERSION < (1,6) else 'django.test.runner.DiscoverRunner',
         SITE_ID = 1,
         COMMENTS_APP = 'threadedcomments',
         COMMENTS_ALLOW_PROFANITIES = True,
-        **template_settings
+        **versioned_settings
     )
 
     sys.stderr.write('Using comments app {0} from {1}\n'.format(base_app, path.dirname(import_module(base_app).__file__)))

tox.ini

@@ -2,6 +2,7 @@
 envlist=
     py27-django{17,18,19,110},
     py35-django{17,18,19,110},
+    py35-django{111,20},
     # py36-django-dev,
     docs,
 
@@ -13,6 +14,8 @@ deps =
     django18: Django >= 1.8,<1.9
     django19: Django >= 1.9,<1.10
     django110: Django >= 1.10,<1.11
+    django111: Django >= 1.11,<2.0
+    django20: Django >= 2.0,<2.1
     django-dev: https://github.com/django/django/tarball/master
 commands=
     python --version