From a763915a03579868c6abdc5cdffbb4c398dc52ee Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 1 Jul 2013 12:01:25 +0200 Subject: [PATCH] Bumped minimum Python version requirement to 2.7 in Django 1.7. --- INSTALL | 3 +-- docs/faq/install.txt | 8 ++++---- docs/intro/install.txt | 10 +++++----- docs/topics/install.txt | 4 ++-- setup.py | 1 - 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/INSTALL b/INSTALL index 5ae2b26900..92be6da650 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ Thanks for downloading Django. -To install it, make sure you have Python 2.6 or greater installed. Then run +To install it, make sure you have Python 2.7 or greater installed. Then run this command from the command prompt: python setup.py install @@ -12,7 +12,6 @@ site-packages directory, which is located wherever your Python installation lives. Some places you might check are: /usr/lib/python2.7/site-packages (Unix, Python 2.7) - /usr/lib/python2.6/site-packages (Unix, Python 2.6) C:\\PYTHON\site-packages (Windows) For more detailed instructions, see docs/intro/install.txt. diff --git a/docs/faq/install.txt b/docs/faq/install.txt index 2c7c35299b..be45012961 100644 --- a/docs/faq/install.txt +++ b/docs/faq/install.txt @@ -16,8 +16,8 @@ How do I get started? What are Django's prerequisites? -------------------------------- -Django requires Python, specifically Python 2.6.5 - 2.7.x, or 3.2.3 and above. -No other Python libraries are required for basic Django usage. +Django requires Python, specifically Python 2.7 or 3.2 and above. No other +Python libraries are required for basic Django usage. 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 @@ -50,8 +50,8 @@ Django version Python versions 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.6 2.6, 2.7 and 3.2, 3.3 +**1.7** **2.7** and **3.2, 3.3** ============== =============== For a given series of Python versions, only the latest release is officially diff --git a/docs/intro/install.txt b/docs/intro/install.txt index 40375e5eca..3ef59dcafb 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.6, -2.7, 3.2 or 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. It works with Python 2.7, +3.2 or 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. .. _sqlite: http://sqlite.org/ @@ -28,8 +28,8 @@ probably already have it installed. You can verify that Python is installed by typing ``python`` from your shell; you should see something like:: - Python 2.6.6 (r266:84292, Dec 26 2010, 22:31:48) - [GCC 4.4.5] on linux2 + Python 2.7.3 (default, Jan 2 2013, 13:56:14) + [GCC 4.7.2] on linux2 Type "help", "copyright", "credits" or "license" for more information. >>> diff --git a/docs/topics/install.txt b/docs/topics/install.txt index 505d51a846..9cf02d96de 100644 --- a/docs/topics/install.txt +++ b/docs/topics/install.txt @@ -7,8 +7,8 @@ This document will get you up and running with Django. Install Python ============== -Being a Python Web framework, Django requires Python. It works with Python 2.6, -2.7, 3.2 or 3.3. +Being a Python Web framework, Django requires Python. It works with Python 2.7, +3.2 or 3.3. Get Python at http://www.python.org. If you're running Linux or Mac OS X, you probably already have it installed. diff --git a/setup.py b/setup.py index 2c64868d00..6278afa116 100644 --- a/setup.py +++ b/setup.py @@ -101,7 +101,6 @@ setup( 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.2',