From 69ec141974e58a6eb08d2bf85f2a147552616e9f Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Tue, 8 Jan 2019 13:07:01 +0100
Subject: [PATCH] Update test matrix, remove unsupported Django 1.10

---
 .travis.yml |  6 ++++--
 setup.py    |  4 ++--
 tox.ini     | 15 +++++----------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8e92358c..c3c5bb99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,18 @@ sudo: false
 cache: pip
 python:
 - '3.6'
-- '3.4'
+- '3.5'
 - '2.7'
 env:
-- PACKAGES="django>=1.10,<1.11 django-polymorphic<2.0"
 - PACKAGES="django>=1.11,<1.12"
 - PACKAGES="django>=2.0,<2.1"
+- PACKAGES="django>=2.1,<2.2"
 matrix:
   exclude:
   - python: '2.7'
     env: PACKAGES="django>=2.0,<2.1"
+  - python: '2.7'
+    env: PACKAGES="django>=2.1,<2.2"
 before_install:
 - pip install codecov
 install:
diff --git a/setup.py b/setup.py
index a0353f85..475d4a73 100755
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ def find_version(*parts):
         'html5lib >= 0.999, != 0.9999, != 1.0b5, != 0.99999, != 1.0b6',
     ],
     requires=[
-        'Django (>=1.10)',
+        'Django (>=1.11)',
     ],
     extras_require = {
         'code': ['Pygments'],
@@ -98,9 +98,9 @@ def find_version(*parts):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Framework :: Django',
-        '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 :: Application Frameworks',
diff --git a/tox.ini b/tox.ini
index 91238e48..2d4f907e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,28 +1,23 @@
 [tox]
 envlist=
-    py27-django{17,18,19,110,111},
-    py33-django{17,18},
-    py36-django{18,19,110,111,20},
-    # py33-django-dev,
+    py27-django{111},
+    py36-django{111,20,21},
+    # py35-django-dev,
     docs,
 
 [testenv]
 deps =
     django-wysiwyg
-    html5lib==1.0b10
+    html5lib
     docutils
     textile
     MarkDown
     Pillow
     Pygments
     micawber
-    django17: Django >= 1.7,<1.8
-    django17: django-polymorphic < 1.3
-    django18: Django >= 1.8,<1.9
-    django19: Django >= 1.9,<1.10
-    django110: Django >= 1.10,<1.11
     django111: Django >= 1.11,<1.12
     django20: Django >= 2.0,<2.1
+    django21: Django >= 2.1,<2.2
     django-dev: https://github.com/django/django/tarball/master
 commands=
     python --version