From 7a007e967b6d143328a36d7c7c839c6a864f605e Mon Sep 17 00:00:00 2001
From: Asif Saifuddin Auvi <auvipy@gmail.com>
Date: Thu, 28 Jun 2018 21:02:29 +0600
Subject: [PATCH] [2.1.x] Refs #28814 -- Documented Python 3.7 compatibility.

Backport of 2f7cd7f8ecb01d30c1dfdaefa1c1714db76d2553 from master
---
 docs/faq/install.txt  | 6 ++----
 docs/releases/2.0.txt | 4 ++--
 setup.py              | 1 +
 tox.ini               | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index bb5ebd09e1..6043f5c8ba 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -46,11 +46,9 @@ What Python version can I use with Django?
 ============== ===============
 Django version Python versions
 ============== ===============
-1.8            2.7, 3.2 (until the end of 2016), 3.3, 3.4, 3.5
-1.9, 1.10      2.7, 3.4, 3.5
 1.11           2.7, 3.4, 3.5, 3.6
-2.0            3.4, 3.5, 3.6
-2.1            3.5, 3.6, 3.7
+2.0            3.4, 3.5, 3.6, 3.7
+2.1, 2.2       3.5, 3.6, 3.7
 ============== ===============
 
 For each version of Python, only the latest micro release (A.B.C) is officially
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index 7ca42908d3..2863997553 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -24,8 +24,8 @@ project.
 Python compatibility
 ====================
 
-Django 2.0 supports Python 3.4, 3.5, and 3.6. We **highly recommend** and only
-officially support the latest release of each series.
+Django 2.0 supports Python 3.4, 3.5, 3.6, and 3.7. We **highly recommend** and
+only officially support the latest release of each series.
 
 The Django 1.11.x series is the last to support Python 2.7.
 
diff --git a/setup.py b/setup.py
index 1760f815bd..ac0b62779c 100644
--- a/setup.py
+++ b/setup.py
@@ -100,6 +100,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3 :: Only',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
diff --git a/tox.ini b/tox.ini
index b10975aa24..2f03d810c8 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}: -rtests/requirements/py3.txt
+    py{3,35,36,37}: -rtests/requirements/py3.txt
     postgres: -rtests/requirements/postgres.txt
     mysql: -rtests/requirements/mysql.txt
     oracle: -rtests/requirements/oracle.txt