From 694c6d56b52bf0b063e111bcc299d380468f850e Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 8 Aug 2018 15:23:27 +0100
Subject: [PATCH] add python 3.7 to test matrix

---
 .travis.yml   | 16 ++++++++++++++++
 CHANGELOG.txt |  1 +
 setup.py      |  1 +
 tox.ini       |  5 +++--
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bd01ca..4343ec5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,10 +26,18 @@ matrix:
      python: 3.5
    - env: TOXENV=py36-dj20-sqlite
      python: 3.6
+   - env: TOXENV=py37-dj20-sqlite
+     python: 3.7
+     dist: xenial
+     sudo: true
    - env: TOXENV=py35-dj21-sqlite
      python: 3.5
    - env: TOXENV=py36-dj21-sqlite
      python: 3.6
+   - env: TOXENV=py37-dj21-sqlite
+     python: 3.7
+     dist: xenial
+     sudo: true
    - env: TOXENV=py27-dj110-postgres
      python: 2.7
    - env: TOXENV=py34-dj110-postgres
@@ -48,10 +56,18 @@ matrix:
      python: 3.5
    - env: TOXENV=py36-dj20-postgres
      python: 3.6
+   - env: TOXENV=py37-dj20-postgres
+     python: 3.7
+     dist: xenial
+     sudo: true
    - env: TOXENV=py35-dj21-postgres
      python: 3.5
    - env: TOXENV=py36-dj21-postgres
      python: 3.6
+   - env: TOXENV=py37-dj21-postgres
+     python: 3.7
+     dist: xenial
+     sudo: true
 
 install:
   - pip install tox
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b49aa20..3c283e3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ Changelog
 4.2 (xx.xx.xxxx)
 ~~~~~~~~~~~~~~~~
 * Django 2.1 compatibility
+* Python 3.7 compatibility
 * Implemented prefetch_related on FakeQuerySet (Haydn Greatnews)
 * Fix: Saving a ClusterableModel with a primary key of 0 no longer throws an IntegrityError (A Lee)
 * Fix: Serialization now respects `serialize=False` on ParentalManyToManyFields (Tadas Dailyda)
diff --git a/setup.py b/setup.py
index e56cf55..7fa0ec1 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,7 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Framework :: Django',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 3f9ec01..004bde7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,8 @@
 envlist = 
     py{27,34,35}-dj110-{sqlite,postgres}
     py{27,35,36}-dj111-{sqlite,postgres}
-    py{34,35,36}-dj20-{sqlite,postgres}
-    py{35,36}-dj21-{sqlite,postgres}
+    py{34,35,36,37}-dj20-{sqlite,postgres}
+    py{35,36,37}-dj21-{sqlite,postgres}
 
 [testenv]
 commands=./runtests.py --noinput
@@ -14,6 +14,7 @@ basepython =
     py34: python3.4
     py35: python3.5
     py36: python3.6
+    py37: python3.7
 
 deps =
     django-taggit>=0.22.2,<0.23