diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/faq/install.txt | 14 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-code/unit-tests.txt | 4 | ||||
| -rw-r--r-- | docs/intro/install.txt | 6 | ||||
| -rw-r--r-- | docs/intro/tutorial01.txt | 2 | ||||
| -rw-r--r-- | docs/releases/1.9.txt | 2 |
5 files changed, 17 insertions, 11 deletions
diff --git a/docs/faq/install.txt b/docs/faq/install.txt index 05906b2a18..38b01a4d6b 100644 --- a/docs/faq/install.txt +++ b/docs/faq/install.txt @@ -16,9 +16,9 @@ How do I get started? What are Django's prerequisites? -------------------------------- -Django requires Python, specifically Python 2.7 or 3.3 and above. Other Python -libraries may be required for some uses, but you'll receive an error about it -as they're needed. +Django requires Python. See the table in the next question for the versions of +Python that work with each version of Django. Other Python libraries may be +required for some uses, but you'll receive an error about it as they're needed. For a development environment -- if you just want to experiment with Django -- you don't need to have a separate Web server installed; Django comes with its @@ -47,13 +47,19 @@ Django version Python versions ============== =============== 1.4 2.5, 2.6, 2.7 **1.7, 1.8** **2.7** and **3.2, 3.3, 3.4** -1.9 2.7, 3.3, 3.4, 3.5 +1.9 2.7, 3.4, 3.5 ============== =============== For each version of Python, only the latest micro release (A.B.C) is officially supported. You can find the latest micro version for each series on the `Python download page <https://www.python.org/downloads/>`_. +Typically, we will support a Python version up to and including the first +Django LTS release that will receive security updates until after security +support for that version of Python ends. For example, Python 3.3 security +support ends September 2017 and Django 1.8 LTS security support ends April +2018. Therefore Django 1.8 is the last version to support Python 3.3. + What Python version should I use with Django? --------------------------------------------- diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt index 694bec7845..e1797c8e3b 100644 --- a/docs/internals/contributing/writing-code/unit-tests.txt +++ b/docs/internals/contributing/writing-code/unit-tests.txt @@ -21,8 +21,8 @@ Running the unit tests Quickstart ~~~~~~~~~~ -If you are on Python < 3.3, you'll first need to install a backport of the -``unittest.mock`` module that's available in Python 3.3+. See +If you are on Python 2, you'll first need to install a backport of the +``unittest.mock`` module that's available in Python 3. See :ref:`running-unit-tests-dependencies` for details on installing `mock`_ and the other optional test dependencies. diff --git a/docs/intro/install.txt b/docs/intro/install.txt index ffdad3c4c2..b4f250afc9 100644 --- a/docs/intro/install.txt +++ b/docs/intro/install.txt @@ -9,9 +9,9 @@ that'll work while you walk through the introduction. Install Python -------------- -Being a Python Web framework, Django requires Python. It works with Python 2.7 -and Python 3.3+. All these versions of Python include a lightweight database called -SQLite_ so you won't need to set up a database just yet. +Being a Python Web framework, Django requires Python. See +:ref:`faq-python-version-support` for details. Python includes a lightweight +database called SQLite_ so you won't need to set up a database just yet. .. _sqlite: http://sqlite.org/ diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt index 6db12d118b..ca96ae54df 100644 --- a/docs/intro/tutorial01.txt +++ b/docs/intro/tutorial01.txt @@ -22,7 +22,7 @@ tell Django is installed and which version by running the following command: If Django is installed, you should see the version of your installation. If it isn't, you'll get an error telling "No module named django". -This tutorial is written for Django |version| and Python 3.3 or later. If the +This tutorial is written for Django |version| and Python 3.4 or later. If the Django version doesn't match, you can refer to the tutorial for your version of Django by using the version switcher at the bottom right corner of this page, or update Django to the newest version. If you are still using Python diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt index 2cd2ad018a..4b7ef5184a 100644 --- a/docs/releases/1.9.txt +++ b/docs/releases/1.9.txt @@ -20,7 +20,7 @@ Python compatibility Like Django 1.8, Django 1.9 requires Python 2.7 or above, though we **highly recommend** the latest minor release. We've dropped support for -Python 3.2 and added support for Python 3.5. +Python 3.2 and 3.3, and added support for Python 3.5. What's new in Django 1.9 ======================== |