summaryrefslogtreecommitdiff
path: root/docs
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:01:33 -0400
commit306deab2c70a6d93c6188924e1cfa8c2d50ccd48 (patch)
tree7453987154243a81184f02e8398e7d13a530f7c3 /docs
parenta779757706b19ef244dc1ede2e1e992735461623 (diff)
Added Python 3.4 support notes.
Diffstat (limited to 'docs')
-rw-r--r--docs/faq/install.txt10
-rw-r--r--docs/releases/1.6.txt2
-rw-r--r--docs/releases/1.7.txt3
3 files changed, 7 insertions, 8 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index be45012961..2c129c954a 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** **2.7** and **3.2, 3.3**
+**1.7** **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 ca960a131b..c54c148665 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
========================
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 8cb0961a4e..8bcb9e8693 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -18,7 +18,8 @@ Python compatibility
====================
Django 1.7 requires Python 2.7 or above, though we **highly recommend**
-the latest minor release. Support for Python 2.6 has been dropped.
+the latest minor release. Support for Python 2.6 has been dropped and support
+for Python 3.4 has been added.
This change should affect only a small number of Django users, as most
operating-system vendors today are shipping Python 2.7 or newer as their default