Merge branch 'master' into curlclientcurlclient

Conflicts:
	kombu/async/hub.py
	kombu/tests/case.py
	kombu/tests/transport/test_redis.py
	kombu/transport/SQS.py

1 files changed, 2 insertions, 5 deletions

diff --git a/setup.py b/setup.py
index e0cbe40c..e5e7b60b 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, 6):
-    raise Exception('Kombu requires Python 2.6 or higher.')
+if sys.version_info < (2, 7):
+    raise Exception('Kombu requires Python 2.7 or higher.')
 
 try:
     from setuptools import setup
@@ -113,8 +113,6 @@ def reqs(*f):
         ) if r]
 
 install_requires = reqs('default.txt')
-if py_version[0:2] == (2, 6):
-    install_requires.extend(reqs('py26.txt'))
 
 # -*- Tests Requires -*-
 
@@ -160,7 +158,6 @@ setup(
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',