From 1cd195a8cfb1a9586533fbf057f3b4b05ed13249 Mon Sep 17 00:00:00 2001
From: Tim Tisdall <tisdall@gmail.com>
Date: Thu, 5 Sep 2019 12:33:44 -0400
Subject: [PATCH 1/3] run tests on Django 2.2

---
 .travis.yml | 3 +++
 tox.ini     | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fa5033d..3363052 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ python:
 
 env:
   matrix:
+    - DJANGO_VERSION=2.2
     - DJANGO_VERSION=2.1
     - DJANGO_VERSION=2.0
     - DJANGO_VERSION=1.11
@@ -19,6 +20,8 @@ matrix:
       env: DJANGO_VERSION=2.0
     - python: "2.7"
       env: DJANGO_VERSION=2.1
+    - python: "2.7"
+      env: DJANGO_VERSION=2.2
 
 install:
   - pip install tox coveralls
diff --git a/tox.ini b/tox.ini
index f1f3377..ba3100c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     covclean,
     py27-dj111,
-    py{35,36,37}-dj{111,20,21},
+    py{35,36,37}-dj{111,20,21,22},
     coverage
 
 [testenv]
@@ -13,6 +13,7 @@ deps =
     dj111: Django>=1.11,<2.0
     dj20: Django>=2.0,<2.1
     dj21: Django>=2.1,<2.2
+    dj22: Django>=2.2,<2.3
     -r{toxinidir}/requirements-test.txt
 
 [testenv:covclean]

From 6bf28075f50774858177a8ca3d149e8d19437f04 Mon Sep 17 00:00:00 2001
From: Tim Tisdall <tisdall@gmail.com>
Date: Tue, 5 Nov 2019 13:15:10 -0500
Subject: [PATCH 2/3] try switching to mysqlclient

---
 requirements-test.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/requirements-test.txt b/requirements-test.txt
index 600b679..5cad54e 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -6,6 +6,5 @@ nose>=1.3.0
 django-nose>=1.2
 flake8>=2.1.0
 restructuredtext_lint==0.12.2
-# We use PyMySQL because it's pure python, has no C dependencies and can emulate MySQLDb
-PyMySQL>=0.7.5
+mysqlclient>=1.3.13
 tox>=1.7.0

From 9e8795f8d04686563c8a57d0f22ba34a66e84382 Mon Sep 17 00:00:00 2001
From: Tim Tisdall <tisdall@gmail.com>
Date: Tue, 5 Nov 2019 13:21:56 -0500
Subject: [PATCH 3/3] remove unneeded call to PyMySQL

---
 runtests.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/runtests.py b/runtests.py
index f9143a8..157243e 100644
--- a/runtests.py
+++ b/runtests.py
@@ -5,10 +5,6 @@
 try:
     from django.conf import settings
 
-    from pymysql import install_as_MySQLdb
-
-    install_as_MySQLdb()
-
     settings.configure(
         DEBUG=True,
         USE_TZ=True,