From 09067c5e2b056d57c0aa526125edf93b71c5e1ec Mon Sep 17 00:00:00 2001
From: John Whitlock <jwhitlock@mozilla.com>
Date: Sun, 26 Aug 2018 15:58:51 -0500
Subject: [PATCH 1/2] Use Python 3.6, not 3.7, in Docker

---
 Dockerfile                     | 2 +-
 examples/explore/docker_run.sh | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 examples/explore/docker_run.sh

diff --git a/Dockerfile b/Dockerfile
index 2aa3323..d4ba0ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3
+FROM python:3.6
 ENV PYTHONUNBUFFERED 1
 
 RUN apt-get update
diff --git a/examples/explore/docker_run.sh b/examples/explore/docker_run.sh
old mode 100644
new mode 100755

From 3548143ab3877eed1a37797cb912bc558e41870a Mon Sep 17 00:00:00 2001
From: John Whitlock <jwhitlock@mozilla.com>
Date: Sun, 26 Aug 2018 16:01:24 -0500
Subject: [PATCH 2/2] Add Django 2.1 support

---
 .travis.yml | 7 +++++++
 setup.py    | 6 ++++++
 tox.ini     | 4 +++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 84b208a..482d3c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,11 +36,18 @@ matrix:
           python: "3.5"
         - env: TOX_ENV=py36-django20-postgis
           python: "3.6"
+        - env: TOX_ENV=py35-django21-postgis
+          python: "3.5"
+        - env: TOX_ENV=py36-django21-postgis
+          python: "3.6"
         - env: TOX_ENV=py35-django-master-postgis
           python: "3.5"
         - env: TOX_ENV=py36-django-master-postgis
           python: "3.6"
+        - env: TOX_ENV=py37-django-master-postgis
+          python: "3.7"
     allow_failures:
         # Django master is allowed to fail
         - env: TOX_ENV=py35-django-master-postgis
         - env: TOX_ENV=py36-django-master-postgis
+        - env: TOX_ENV=py37-django-master-postgis
diff --git a/setup.py b/setup.py
index d6e3043..5e997d3 100755
--- a/setup.py
+++ b/setup.py
@@ -86,6 +86,12 @@ def get_long_description():
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Django",
+        "Framework :: Django :: 1.8",
+        "Framework :: Django :: 1.9",
+        "Framework :: Django :: 1.10",
+        "Framework :: Django :: 1.11",
+        "Framework :: Django :: 2.0",
+        "Framework :: Django :: 2.1",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
diff --git a/tox.ini b/tox.ini
index c11b36b..4dd3273 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,8 @@ envlist =
     py{27,34}-django18-{postgis,spatiallite}
     py{27,34,35}-django{19,110}-{postgis,spatiallite}
     py{27,34,35,36}-django111-{postgis,spatiallite}
-    py{35,36}-django{20,-master}-{postgis,spatiallite}
+    py{35,36}-django20-{postgis,spatiallite}
+    py{35,36,37}-django{21,-master}-{postgis,spatiallite}
 
 [flake8]
 exclude = .tox/*,.build/*,.dist/*,build/*
@@ -18,6 +19,7 @@ deps=
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
     django-master: https://github.com/django/django/archive/master.tar.gz
     postgis: psycopg2
     nose