From 018074b62800e2ec91abc6e3cb36f73bc1d4f6c1 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Sun, 16 Sep 2018 18:26:55 +0200
Subject: [PATCH] Add Django 2.1 to test matrix

---
 .travis.yml | 3 +++
 setup.py    | 2 +-
 tox.ini     | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7a6eaa0..51ce3427 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,12 @@ env:
   - LINT="yes"
   - DJANGO="1.11"
   - DJANGO="2.0"
+  - DJANGO="2.1"
 
 matrix:
   exclude:
+  - python: "3.4"
+    env: DJANGO="2.1"
   - python: "3.5"
     env: LINT="yes"
   - python: "3.6"
diff --git a/setup.py b/setup.py
index 7822150e..db7a84f7 100755
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def get_path(fname):
 
 
 install_requirements = [
-    "Django>=1.11,<2.1.1",
+    "Django>=1.11,<2.2",
     "bleach>=2.1,<2.2",
     "Pillow",
     "django-nyt>=1.1.1,<1.2",
diff --git a/tox.ini b/tox.ini
index a9ed374d..38507594 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 # Ensure you add to .travis.yml if you add here, using `tox -l`
-envlist = {py34,py35,py36}-django{111,20},lint
+envlist = {py34,py35,py36}-django{111,20,21},lint
 
 
 [travis]
@@ -13,6 +13,7 @@ python =
 DJANGO =
   1.11: django111
   2.0: django20
+  2.1: django21
 LINT =
   yes: lint
 
@@ -35,6 +36,7 @@ deps =
   .[test]
   django111: Django>=1.11,<2.0
   django20: Django>=2.0,<2.1
+  django21: Django>=2.1,<2.2
 
 basepython =
   py34: python3.4
-- 
2.45.2