From ddcd8b539be4a5ffb7e6c89830bec9a24914ba55 Mon Sep 17 00:00:00 2001
From: Michael K <michael-k@users.noreply.github.com>
Date: Tue, 8 Sep 2020 14:40:21 +0000
Subject: [PATCH] Run tests against Python 3.9 (#7517)

3.9.0 final is expected on Monday, 2020-10-05
See https://www.python.org/dev/peps/pep-0596/#schedule

Also mention Django 3.1 compat where missing.
---
 .travis.yml   | 3 +++
 README.md     | 4 ++--
 docs/index.md | 4 ++--
 setup.py      | 1 +
 tox.ini       | 6 +++---
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 39efaf4fc..c204c5460 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,9 @@ matrix:
       - { python: "3.8", env: DJANGO=3.1 }
       - { python: "3.8", env: DJANGO=master }
 
+      - { python: "3.9-dev", env: DJANGO=3.1 }
+      - { python: "3.9-dev", env: DJANGO=master }
+
       - { python: "3.8", env: TOXENV=base }
       - { python: "3.8", env: TOXENV=lint }
       - { python: "3.8", env: TOXENV=docs }
diff --git a/README.md b/README.md
index 4dfff3119..8af1466f8 100644
--- a/README.md
+++ b/README.md
@@ -52,8 +52,8 @@ There is a live example API for testing purposes, [available here][sandbox].
 
 # Requirements
 
-* Python (3.5, 3.6, 3.7, 3.8)
-* Django (2.2, 3.0)
+* Python (3.5, 3.6, 3.7, 3.8, 3.9)
+* Django (2.2, 3.0, 3.1)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.
diff --git a/docs/index.md b/docs/index.md
index 54654c7c5..0273da9f1 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -83,8 +83,8 @@ continued development by **[signing up for a paid plan][funding]**.
 
 REST framework requires the following:
 
-* Python (3.5, 3.6, 3.7, 3.8)
-* Django (2.2, 3.0)
+* Python (3.5, 3.6, 3.7, 3.8, 3.9)
+* Django (2.2, 3.0, 3.1)
 
 We **highly recommend** and only officially support the latest patch release of
 each Python and Django series.
diff --git a/setup.py b/setup.py
index 38e680e10..e2a1c0222 100755
--- a/setup.py
+++ b/setup.py
@@ -101,6 +101,7 @@ setup(
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3 :: Only',
         'Topic :: Internet :: WWW/HTTP',
     ],
diff --git a/tox.ini b/tox.ini
index 190865f23..d5e769764 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,8 +2,8 @@
 envlist =
        {py35,py36,py37}-django22,
        {py36,py37,py38}-django30,
-       {py36,py37,py38}-django31,
-       {py36,py37,py38}-djangomaster,
+       {py36,py37,py38,py39}-django31,
+       {py36,py37,py38,py39}-djangomaster,
        base,dist,lint,docs,
 
 [travis:env]
@@ -22,7 +22,7 @@ setenv =
 deps =
         django22: Django>=2.2,<3.0
         django30: Django>=3.0,<3.1
-        django31: Django>=3.1a1,<3.2
+        django31: Django>=3.1,<3.2
         djangomaster: https://github.com/django/django/archive/master.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt