Now depends on Python 2.6

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-    - 2.5
     - 2.6
     - 2.7
 install:

docs/contributing.rst

@@ -420,7 +420,7 @@ To run the tests for all supported Python versions simply execute::
 If you only want to test specific Python versions use the :option:`-e`
 option::
 
-    $ tox -e py25,py26
+    $ tox -e py26
 
 Building the documentation
 --------------------------

requirements/README.rst

@@ -8,11 +8,7 @@ Index
 
 * `requirements/default.txt`
 
-    The default requirements (Python 2.6+).
-
-* `requirements/py25.txt`
-
-    Extra requirements needed to run on Python 2.5.
+    The default requirements (Python 2.7+).
 
 * `requirements/py26.txt`
 
@@ -27,12 +23,11 @@ Index
 Examples
 ========
 
-Running the tests using Python 2.5
+Running the tests using Python 2.6
 ----------------------------------
 
 ::
 
-    $ pip -E $VIRTUAL_ENV install -U -r requirements/py25.txt
     $ pip -E $VIRTUAL_ENV install -U -r requirements/default.txt
     $ pip -E $VIRTUAL_ENV install -U -r requirements/test.txt
 

requirements/py25.txt

@@ -1,3 +0,0 @@
-importlib
-ordereddict
-simplejson

requirements/test-py25.txt

@@ -1,2 +0,0 @@
-unittest2>=0.4.0
-simplejson

setup.py

@@ -15,8 +15,8 @@ import os
 import sys
 import codecs
 
-if sys.version_info < (2, 5):
-    raise Exception('Celery requires Python 2.5 or higher.')
+if sys.version_info < (2, 6):
+    raise Exception('Celery 3.1 requires Python 2.6 or higher.')
 
 try:
     orig_path = sys.path[:]
@@ -57,7 +57,6 @@ classes = """
     Topic :: Software Development :: Object Brokering
     Programming Language :: Python
     Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.5
     Programming Language :: Python :: 2.6
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: Implementation :: CPython
@@ -146,8 +145,6 @@ if is_jython:
     install_requires.extend(reqs('jython.txt'))
 if py_version[0:2] == (2, 6):
     install_requires.extend(reqs('py26.txt'))
-elif py_version[0:2] == (2, 5):
-    install_requires.extend(reqs('py25.txt'))
 
 # -*- Tests Requires -*-
 
@@ -158,9 +155,6 @@ elif is_pypy:
 else:
     tests_require = reqs('test.txt')
 
-if py_version[0:2] == (2, 5):
-    tests_require.extend(reqs('test-py25.txt'))
-
 # -*- Long Description -*-
 
 if os.path.exists('README.rst'):

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py25,py26,py27,pypy
+envlist = py26,py27,pypy
 
 [testenv]
 distribute = True
@@ -53,18 +53,6 @@ commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
                      --cover3-html-dir={toxinidir}/cover        \
                      --cover3-xml-file={toxinidir}/coverage.xml
 
-[testenv:py25]
-basepython = python2.5
-deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/py25.txt
-       -r{toxinidir}/requirements/test.txt
-commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           nosetests --with-xunit                               \
-                     --xunit-file={toxinidir}/nosetests.xml     \
-                     --with-coverage3 --cover3-xml              \
-                     --cover3-html-dir={toxinidir}/cover        \
-                     --cover3-xml-file={toxinidir}/coverage.xml
-
 [testenv:pypy]
 basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt