Merge pull request #105 from SunilMohanAdapa/py36-dj20

Add support for Python 3.6 and Django 2.0
tzangms · Mar 15, 2018 · 79a33c5 · 79a33c5
2 parents 2b0aff1 + 8e366a9
commit 79a33c5
Show file tree

Hide file tree

Showing 5 changed files with 133 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,76 @@
 language: python
 
-env:
-  matrix:
-    - TOX_ENV=py27-dj15
-    - TOX_ENV=py27-dj16
-    - TOX_ENV=py27-dj17
-    - TOX_ENV=py27-dj18
-    - TOX_ENV=py27-dj19
-    - TOX_ENV=py27-dj110
-    - TOX_ENV=py27-dj111
-    - TOX_ENV=py34-dj15
-    - TOX_ENV=py34-dj16
-    - TOX_ENV=py34-dj17
-    - TOX_ENV=py34-dj18
-    - TOX_ENV=py34-dj19
-    - TOX_ENV=py34-dj110
-    - TOX_ENV=py34-dj111
+matrix:
+  include:
+    - python: 2.7
+      env:
+        - TOX_ENV=py27-dj15
+    - python: 2.7
+      env:
+        - TOX_ENV=py27-dj16
+    - python: 2.7
+      env:
+        - TOX_ENV=py27-dj17
+    - python: 2.7
+      env:
+        - TOX_ENV=py27-dj18
+    - python: 2.7
+      env:
+        - TOX_ENV=py27-dj19
+    - python: 2.7
+      env:
+        - TOX_ENV=py27-dj110
+    - python: 2.7
+      env:
+        - TOX_ENV=py27-dj111
+    - python: 2.7
+      env:
+        - TOX_ENV=py34-dj15
+    - python: 3.4
+      env:
+        - TOX_ENV=py34-dj16
+    - python: 3.4
+      env:
+        - TOX_ENV=py34-dj17
+    - python: 3.4
+      env:
+        - TOX_ENV=py34-dj18
+    - python: 3.4
+      env:
+        - TOX_ENV=py34-dj19
+    - python: 3.4
+      env:
+        - TOX_ENV=py34-dj110
+    - python: 3.4
+      env:
+        - TOX_ENV=py34-dj111
+    - python: 3.4
+      env:
+        - TOX_ENV=py34-dj20
+    - python: 3.5
+      env:
+        - TOX_ENV=py35-dj18
+    - python: 3.5
+      env:
+        - TOX_ENV=py35-dj19
+    - python: 3.5
+      env:
+        - TOX_ENV=py35-dj110
+    - python: 3.5
+      env:
+        - TOX_ENV=py35-dj111
+    - python: 3.5
+      env:
+        - TOX_ENV=py35-dj20
+    - python: 3.6
+      env:
+        - TOX_ENV=py36-dj110
+    - python: 3.6
+      env:
+        - TOX_ENV=py36-dj111
+    - python: 3.6
+      env:
+        - TOX_ENV=py36-dj20
 
 install:
   - pip install tox coverage coveralls

diff --git a/runtests.py b/runtests.py
@@ -6,8 +6,25 @@
 
 from django.conf import settings
 
+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',
+    )
 
 
+if django.VERSION < (1, 10):
+    middleware_arg = {
+        'MIDDLEWARE_CLASSES': middleware,
+    }
+else:
+    middleware_arg = {
+        'MIDDLEWARE': middleware,
+    }
+
 settings.configure(
     DATABASES = {
         'default': {
@@ -23,24 +40,24 @@
         'django.contrib.sites',
         'bootstrapform',
     ],
-    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',
-    ),
     SITE_ID=1,
     DEBUG=False,
     ROOT_URLCONF='',
     TEMPLATES = [  # For >= Django 1.10
-        {'BACKEND': 'django.template.backends.django.DjangoTemplates', 'APP_DIRS': True},
-    ]
+        {
+            'BACKEND': 'django.template.backends.django.DjangoTemplates',
+            'APP_DIRS': True,
+            'OPTIONS': {
+                'context_processors': [
+                    'django.contrib.auth.context_processors.auth',
+                ],
+            },
+        },
+    ],
+    **middleware_arg
 )
 
 
-
 def runtests(**test_args):
     from django.test.utils import get_runner
 

diff --git a/setup.py b/setup.py
@@ -15,6 +15,7 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
     ],
     keywords='bootstrap,django',
     author='tzangms',

diff --git a/tests/test_settings.py b/tests/test_settings.py
@@ -1,4 +1,6 @@
+import django
 import os
+
 local_path = lambda path: os.path.join(os.path.dirname(__file__), path)
 
 DATABASES = {
@@ -10,11 +12,18 @@
 
 SITE_ID = 1
 
-MIDDLEWARE_CLASSES = (
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-)
+if django.VERSION < (1, 10):
+    MIDDLEWARE_CLASSES = (
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+    )
+else:
+    MIDDLEWARE = (
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+    )
 
 INSTALLED_APPS = [
     'django.contrib.contenttypes',
@@ -44,4 +53,19 @@
     local_path('templates'),
 )
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+        'DIRS': [
+            local_path('templates'),
+        ],
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+            ],
+        },
+    },
+]
+
 SECRET_KEY = 'django-bootstrap-form'
diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,14 @@
 [tox]
-envlist = {py27,py34}-dj{15,16,17,18,19,110,111}
+envlist = {py27,py34,py35,py36}-dj{15,16,17,18,19,110,111,20}
 skipsdist=True
 
 
 [testenv]
 basepython =
     py27: python2.7
     py34: python3.4
+    py35: python3.5
+    py36: python3.6
 deps = 
     pytest
     dj15: django>=1.5,<1.6
@@ -16,6 +18,7 @@ deps =
     dj19: django>=1.9,<1.10
     dj110: django>=1.10,<1.11
     dj111: django>=1.10,<1.11
+    dj20: django>=2.0,<2.1
 commands = python setup.py test