From 4fb9c84cb978ee7a9ec512829ff79cd1c079a261 Mon Sep 17 00:00:00 2001
From: Nik Nyby <nnyby@columbia.edu>
Date: Thu, 16 Nov 2017 16:55:34 -0500
Subject: [PATCH 1/2] tox: add django 1.11 and python 3.6

---
 tox.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index e2c45d40..53cc8378 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,34,35}-{dj18,dj19,dj110}
+envlist = py{27,34,35,36}-{dj18,dj19,dj110,dj111}
 skipsdist = True
 
 [testenv]
@@ -7,11 +7,13 @@ basepython =
     py27: python2.7
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 commands = python tests/manage.py {posargs:jenkins --enable-coverage --pep8-max-line-length=150 --liveserver=localhost:8090-8100 --output-dir=reports/{envname} --testrunner=tests.runner.CustomTestRunner --ok}
 deps =
     dj18: django==1.8.17
     dj19: django==1.9.12
     dj110: django==1.10.5
+    dj111: django==1.11.7
     pylint==1.6.5
     pylint-django==0.7.2
     coverage==4.3.4

From f20d3b29338e7428f61b3229ae286a2744875337 Mon Sep 17 00:00:00 2001
From: Nik Nyby <nnyby@columbia.edu>
Date: Wed, 6 Dec 2017 11:53:40 -0500
Subject: [PATCH 2/2] django 1.11.8

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 53cc8378..09f38910 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ deps =
     dj18: django==1.8.17
     dj19: django==1.9.12
     dj110: django==1.10.5
-    dj111: django==1.11.7
+    dj111: django==1.11.8
     pylint==1.6.5
     pylint-django==0.7.2
     coverage==4.3.4