summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAsif Saifuddin Auvi <auvipy@gmail.com>2018-06-28 21:02:29 +0600
committerTim Graham <timograham@gmail.com>2018-06-28 11:05:32 -0400
commit7a007e967b6d143328a36d7c7c839c6a864f605e (patch)
tree7663a4049fd69fb32154c4ee90194db9ee55c3eb /docs
parent08c3581ca99620e6185ddfb8a76f29eb23b00e04 (diff)
[2.1.x] Refs #28814 -- Documented Python 3.7 compatibility.
Backport of 2f7cd7f8ecb01d30c1dfdaefa1c1714db76d2553 from master
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/install.txt6
-rw-r--r--docs/releases/2.0.txt4
2 files changed, 4 insertions, 6 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.