From b4b8ca489534621ba2633a4037e5b9b4710bf88f Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Tue, 13 Oct 2020 08:35:01 +0200
Subject: [PATCH] [2.2.x] Refs #31040 -- Doc'd Python 3.9 compatibility.

Backport of e18156b6c35908f2a4026287b5225a6a4da8af1a from master.
---
 docs/faq/install.txt     | 2 +-
 docs/releases/2.2.17.txt | 7 +++++++
 docs/releases/2.2.txt    | 6 +++---
 docs/releases/index.txt  | 1 +
 setup.py                 | 1 +
 tox.ini                  | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 docs/releases/2.2.17.txt

diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index 5f322bc7e63..d3f79c22466 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -49,7 +49,7 @@ Django version Python versions
 1.11           2.7, 3.4, 3.5, 3.6, 3.7 (added in 1.11.17)
 2.0            3.4, 3.5, 3.6, 3.7
 2.1            3.5, 3.6, 3.7
-2.2            3.5, 3.6, 3.7, 3.8 (added in 2.2.8)
+2.2            3.5, 3.6, 3.7, 3.8 (added in 2.2.8), 3.9 (added in 2.2.17)
 ============== ===============
 
 For each version of Python, only the latest micro release (A.B.C) is officially
diff --git a/docs/releases/2.2.17.txt b/docs/releases/2.2.17.txt
new file mode 100644
index 00000000000..d574de6574b
--- /dev/null
+++ b/docs/releases/2.2.17.txt
@@ -0,0 +1,7 @@
+===========================
+Django 2.2.17 release notes
+===========================
+
+*Expected November 2, 2020*
+
+Django 2.2.17 adds compatibility with Python 3.9.
diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
index 4e440e1c180..f602fd0b46e 100644
--- a/docs/releases/2.2.txt
+++ b/docs/releases/2.2.txt
@@ -23,9 +23,9 @@ end in April 2020.
 Python compatibility
 ====================
 
-Django 2.2 supports Python 3.5, 3.6, 3.7, and 3.8 (as of 2.2.8). We
-**highly recommend** and only officially support the latest release of each
-series.
+Django 2.2 supports Python 3.5, 3.6, 3.7, 3.8 (as of 2.2.8), and 3.9 (as of
+2.2.17). We **highly recommend** and only officially support the latest release
+of each series.
 
 .. _whats-new-2.2:
 
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index 0138f89944a..247b69e7978 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -25,6 +25,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+   2.2.17
    2.2.16
    2.2.15
    2.2.14
diff --git a/setup.py b/setup.py
index fd0104e7a7f..676aba5f1b7 100644
--- a/setup.py
+++ b/setup.py
@@ -102,6 +102,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',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
diff --git a/tox.ini b/tox.ini
index fa0957d541d..2f36aa409ce 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ passenv = DJANGO_SETTINGS_MODULE PYTHONPATH HOME DISPLAY
 setenv =
     PYTHONDONTWRITEBYTECODE=1
 deps =
-    py{3,35,36,37,38}: -rtests/requirements/py3.txt
+    py{3,35,36,37,38,39}: -rtests/requirements/py3.txt
     postgres: -rtests/requirements/postgres.txt
     mysql: -rtests/requirements/mysql.txt
     oracle: -rtests/requirements/oracle.txt