summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-08-11 11:17:08 -0400
committerGitHub <noreply@github.com>2017-08-11 11:17:08 -0400
commitabd723c6a010be1bc06687d21e8841e07af6fde3 (patch)
treeb4fa5e8cf72fe9e5f45c8d1df7d5a43fd49107b3 /docs
parent0ec134e3404202ab58e24b8049a8b33e40b0104f (diff)
Fixed #27855 -- Updated docs for Python 3.4 support in Django 2.0.
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/install.txt3
-rw-r--r--docs/releases/1.11.txt2
-rw-r--r--docs/releases/2.0.txt12
3 files changed, 12 insertions, 5 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index 800b981064..bb5ebd09e1 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -49,7 +49,8 @@ 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.5+
+2.0 3.4, 3.5, 3.6
+2.1 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/1.11.txt b/docs/releases/1.11.txt
index 8b19187983..2a539441d5 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -27,7 +27,7 @@ release to support Python 3.6. 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. The next major
-release, Django 2.0, will only support Python 3.5+.
+release, Django 2.0, will only support Python 3.4+.
Deprecating warnings are no longer loud by default
==================================================
diff --git a/docs/releases/2.0.txt b/docs/releases/2.0.txt
index fef194ef7e..c4f5a8147c 100644
--- a/docs/releases/2.0.txt
+++ b/docs/releases/2.0.txt
@@ -17,9 +17,15 @@ project.
Python compatibility
====================
-Django 2.0 supports Python 3.5+. Since Django 1.11, support for Python 2.7 and
-3.4 is removed. We **highly recommend** and only officially support the latest
-release of each series.
+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.
+
+The Django 1.11.x series is the last to support Python 2.7.
+
+Django 2.0 will be the last release series to support Python 3.4. If you plan
+a deployment of Python 3.4 beyond the end-of-life for Django 2.0 (April 2019),
+stick with Django 1.11 LTS (supported until April 2020) instead. Note, however,
+that the end-of-life for Python 3.4 is March 2019.
Third-party library support for older version of Django
=======================================================