From d16ac9be4dd11721e189bd2622c5bbc2ec727b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Bielawski?= <michal.bielawski@apperio.com>
Date: Tue, 3 Mar 2020 18:20:49 +0000
Subject: [PATCH] Add newer versions of Django and Python to CI.

---
 .travis.yml | 5 ++++-
 setup.cfg   | 2 +-
 setup.py    | 2 ++
 tox.ini     | 7 ++++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 946f8ba..965931f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: python
 sudo: false
 python:
 - "2.7"
-- "3.6"
+- "3.8"
 env:
   global:
   - PYTHONPATH=tests/testapp
@@ -13,6 +13,9 @@ env:
   - DJANGO_VERSION=">=1.11,<2.0"
   - DJANGO_VERSION=">=2.0,<2.1"
   - DJANGO_VERSION=">=2.1,<2.2"
+  - DJANGO_VERSION=">=2.2,<3.0"
+  - DJANGO_VERSION=">=3.0,<3.1"
+  - DJANGO_VERSION=">=3.1,<3.2"
 matrix:
   exclude:
   - python: "2.7"
diff --git a/setup.cfg b/setup.cfg
index c4dc8b0..12043b0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,5 +10,5 @@ universal=1
 # E301: expected 1 blank line, found 1
 # E302: expected 2 blank lines, found 0
 [flake8]
-ignore = E127,E128,E265,E301,E302,E305,E306
+ignore = E127,E128,E265,E301,E302,E305,E306,W504
 max-line-length = 90
diff --git a/setup.py b/setup.py
index 5769bbf..6ecd093 100755
--- a/setup.py
+++ b/setup.py
@@ -61,6 +61,8 @@ def read(fname):
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     test_suite='tests'
 )
diff --git a/tox.ini b/tox.ini
index bdabbd3..726ba74 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,7 @@
 [tox]
-envlist={py27,py33,py34,py35,py36}-{django18,django19,django110,django111,django20,django21}
+envlist=
+	py{27,33,34,35,36,37,38}-django{18,19,110,111,20,21,22}
+	py{36,37,38}-django{30,31}
 
 [testenv]
 deps=
@@ -25,6 +27,9 @@ deps=
     django111: django>=1.11,<2.0
     django20: django>=2.0,<2.1
     django21: django>=2.1,<2.2
+    django22: django>=2.2,<3.0
+    django30: django>=3.0,<3.1
+    django31: django>=3.1,<3.2
 commands=
     flake8 .
     py.test