From 5f59d692ccc79b4c17dd6e20efc7f1c37650457e Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Thu, 27 Apr 2017 12:09:59 +0200
Subject: [PATCH] Enable Django 1.11 in tests

(still needs latest django-polymorphic git release)
---
 .travis.yml | 7 +++++++
 tox.ini     | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9dba817d..38e81e23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
 - DJANGO="django>=1.8.0,<1.9.0"
 - DJANGO="django>=1.9.0,<1.10.0"
 - DJANGO="django>=1.10.0,<1.11.0"
+- DJANGO="django>=1.11.0,<1.12.0"
 matrix:
   exclude:
   - python: '2.6'
@@ -23,12 +24,18 @@ matrix:
     env: DJANGO="django>=1.9.0,<1.10.0"
   - python: '2.6'
     env: DJANGO="django>=1.10.0,<1.11.0"
+  - python: '2.6'
+    env: DJANGO="django>=1.11.0,<1.12.0"
   - python: '3.3'
     env: DJANGO="django>=1.4.0,<1.5.0"
   - python: '3.3'
     env: DJANGO="django>=1.9.0,<1.10.0"
   - python: '3.3'
     env: DJANGO="django>=1.10.0,<1.11.0"
+  - python: '3.3'
+    env: DJANGO="django>=1.11.0,<1.12.0"
+  allow_failures:
+    - env: DJANGO="django>=1.11.0,<1.12.0"
 before_install:
 - pip install codecov
 install:
diff --git a/tox.ini b/tox.ini
index e15692d4..b9a2540d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist=
     py26-django{15,16},
-    py27-django{15,16,17,18,19,110},
+    py27-django{15,16,17,18,19,110,111},
     py33-django{16,17,18},
-    py34-django{16,17,18,19,110},
+    py34-django{16,17,18,19,110,111},
     # py33-django-dev,
     docs,
 
@@ -22,6 +22,7 @@ deps =
     django18: Django >= 1.8,<1.9
     django19: Django >= 1.9,<1.10
     django110: Django >= 1.10,<1.11
+    django111: Django >= 1.11,<1.12
     django-dev: https://github.com/django/django/tarball/master
 commands=
     python --version