Add support for Python 3.9django-31

3 files changed, 22 insertions, 14 deletions

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a4a1d3d..67e1fbf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,29 +12,36 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version:
-          - 3.4
-          - 3.6
-          - pypy3
-        django-family:
-          - 111
-          - 22
         include:
+          # Django 1.11: 3.4, 3.7
+          - python-version: 2.7
+            django-family: 111
+          - python-version: 3.4
+            django-family: 111
+          - python-version: 3.7
+            django-family: 111
+          - python-version: pypy3
+            django-family: 111
+
+          # Django 2.2: 3.5, 3.7, 3.8
+          - python-version: 3.5
+            django-family: 22
           - python-version: 3.7
             django-family: 22
           - python-version: 3.8
             django-family: 22
-          - python-version: 3.7
+          - python-version: pypy3
+            django-family: 22
+
+          # Django 3.1: Python 3.6, 3.8, 3.9
+          - python-version: 3.6
             django-family: 31
           - python-version: 3.8
             django-family: 31
-          - python-version: pypy3
+          - python-version: 3.9
             django-family: 31
-        exclude:
           - python-version: pypy3
-            django-family: 111
-          - python-version: 3.4
-            django-family: 22
+            django-family: 31
 
     env:
       TOXENV: django${{ matrix.django-family }}
diff --git a/ChangeLog b/ChangeLog
index 6b23a8a..c8453e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ ChangeLog
 *New:*
 
     * Add support for Django 3.1
-    * Add support for Python 3.7 / Python 3.8
+    * Add support for Python 3.7 / 3.8 / 3.9
 
 
 2.8.5 (2020-04-29)
diff --git a/setup.cfg b/setup.cfg
index 6973ec1..42360d4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,6 +25,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Topic :: Software Development :: Libraries :: Python Modules
 
 [options]