summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-03-26 10:55:59 -0400
committerTim Graham <timograham@gmail.com>2014-03-27 08:14:39 -0400
commitf659c8e13aa5691f7460131c84b283ed4fe990bf (patch)
tree8b15f98cb9bca16b2555a6cb31d27d84c3b2b08b
parentfe83cfe9eddae67838d453fa247bd47e1b3bf277 (diff)
[1.6.x] Added Python 3.4 support notes.
Backport of 306deab2c7 from master
-rw-r--r--docs/faq/install.txt10
-rw-r--r--docs/releases/1.6.txt2
2 files changed, 5 insertions, 7 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index 2c7c35299b..9aa88b3b9e 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -44,19 +44,15 @@ What Python version can I use with Django?
============== ===============
Django version Python versions
============== ===============
-1.0 2.3, 2.4, 2.5, 2.6
-1.1 2.3, 2.4, 2.5, 2.6
-1.2 2.4, 2.5, 2.6, 2.7
-1.3 2.4, 2.5, 2.6, 2.7
1.4 2.5, 2.6, 2.7
1.5 2.6, 2.7 and 3.2, 3.3 (experimental)
**1.6** **2.6, 2.7** and **3.2, 3.3**
-*1.7 (future)* *2.7* and *3.2, 3.3*
+*1.7 (future)* *2.7* and *3.2, 3.3, 3.4*
============== ===============
For a given series of Python versions, only the latest release is officially
-supported. For instance, at the time of writing (July 1st, 2013), the latest
-release in the 2.7 series is 2.7.5.
+supported. For instance, at the time of writing (April 1st, 2014), the latest
+release in the 2.7 series is 2.7.6.
What Python version should I use with Django?
---------------------------------------------
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 60ff928221..d1fa6e41b6 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -44,6 +44,8 @@ supported Python series (2.6.X, 2.7.X, 3.2.X, and 3.3.X).
Django 1.6 will be the final release series to support Python 2.6; beginning
with Django 1.7, the minimum supported Python version will be 2.7.
+Python 3.4 is not supported, but support will be added in Django 1.7.
+
What's new in Django 1.6
========================