From c1e06243d0ffb5fda664f15db1da4d53540ebdfb Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Mon, 12 Nov 2012 15:56:30 +0000
Subject: [PATCH] [3.0] Requires Python 2.6 or higher

---
 .travis.yml |  3 ++-
 setup.py    |  7 ++++---
 tox.ini     | 15 +--------------
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f0f6716b..4a18d765 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 language: python
 python:
-    - 2.5
     - 2.6
     - 2.7
+    - 3.2
+    - 3.3
 install: pip install --use-mirrors tox
 script: TOXENV=py$(echo $TRAVIS_PYTHON_VERSION | tr -d .) tox
diff --git a/setup.py b/setup.py
index 3dbebc00..cf4c9b61 100644
--- a/setup.py
+++ b/setup.py
@@ -7,8 +7,8 @@ import codecs
 extra = {}
 PY3 = sys.version_info[0] == 3
 
-if sys.version_info < (2, 4):
-    raise Exception('Kombu requires Python 2.4 or higher.')
+if sys.version_info < (2, 6):
+    raise Exception('Kombu requires Python 2.6 or higher.')
 
 try:
     from setuptools import setup
@@ -138,9 +138,10 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
diff --git a/tox.ini b/tox.ini
index d73fb6e9..fcfeef74 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py25,py26,py27,py33,pypy
+envlist = py26,py27,py33,pypy
 
 [testenv]
 distribute = True
@@ -83,19 +83,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
-       -r{toxinidir}/requirements/test-ci.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