Merge pull request #145 from tisdall/update_tox

run tests on Django 2.2

Author: mwarkentin

.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

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

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,

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]