From 7189683cb71666786e1fee3d22cf1ef769cb90ec Mon Sep 17 00:00:00 2001
From: Jon Dufresne <jon.dufresne@gmail.com>
Date: Sat, 8 Apr 2017 08:41:41 -0700
Subject: [PATCH] Add testing for Django 1.11 and Python 3.6

Fixes #289
---
 .travis.yml            | 44 ++++++++++++++++++++++++++++--------------
 requirements-tests.txt |  2 +-
 setup.py               |  2 ++
 tox.ini                |  4 +++-
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da94abbce..91aeef546 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,20 +2,36 @@ sudo: false
 language: python
 cache: pip
 
-python:
-  - 3.5
-
-env:
-  - TOX_ENV=py27-django18
-  - TOX_ENV=py33-django18
-  - TOX_ENV=py34-django18
-  - TOX_ENV=py35-django18
-  - TOX_ENV=py27-django19
-  - TOX_ENV=py34-django19
-  - TOX_ENV=py35-django19
-  - TOX_ENV=py27-django110
-  - TOX_ENV=py34-django110
-  - TOX_ENV=py35-django110
+matrix:
+  include:
+    - python: 2.7
+      env: TOX_ENV=py27-django18
+    - python: 3.3
+      env: TOX_ENV=py33-django18
+    - python: 3.4
+      env: TOX_ENV=py34-django18
+    - python: 3.5
+      env: TOX_ENV=py35-django18
+    - python: 2.7
+      env: TOX_ENV=py27-django19
+    - python: 3.4
+      env: TOX_ENV=py34-django19
+    - python: 3.5
+      env: TOX_ENV=py35-django19
+    - python: 2.7
+      env: TOX_ENV=py27-django110
+    - python: 3.4
+      env: TOX_ENV=py34-django110
+    - python: 3.5
+      env: TOX_ENV=py35-django110
+    - python: 2.7
+      env: TOX_ENV=py27-django111
+    - python: 3.4
+      env: TOX_ENV=py34-django111
+    - python: 3.5
+      env: TOX_ENV=py35-django111
+    - python: 3.6
+      env: TOX_ENV=py36-django111
 
 before_install:
   - pip install codecov
diff --git a/requirements-tests.txt b/requirements-tests.txt
index d87d26210..4fb5282ea 100644
--- a/requirements-tests.txt
+++ b/requirements-tests.txt
@@ -1,4 +1,4 @@
-Django>=1.7
+Django>=1.8
 pytest-cov>=2.2.1
 boto>=2.32.0
 boto3>=1.2.3
diff --git a/setup.py b/setup.py
index bdecbba22..c7a6d3373 100644
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,7 @@ def get_requirements_tests():
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
@@ -38,6 +39,7 @@ def get_requirements_tests():
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     tests_require=get_requirements_tests(),
     test_suite='tests',
diff --git a/tox.ini b/tox.ini
index d181cd7e5..eaa765377 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,7 @@ envlist =
     {py27,py33,py34,py35}-django18,
     {py27,py34,py35}-django19
     {py27,py34,py35}-django110
+    {py27,py34,py35,py36}-django111
 
 
 [testenv]
@@ -14,7 +15,8 @@ deps =
     django18: Django>=1.8, <1.9
     django19: Django>=1.9, <1.10
     django110: Django>=1.10, <1.11
-    py27: mock==1.0.1
+    django111: Django>=1.11, <2.0
+    py27: mock
     boto>=2.32.0
     pytest-cov>=2.2.1
     boto3>=1.2.3