diff --git a/.travis.yml b/.travis.yml index 94451d1..11731ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ cache: - $HOME/.cache/pip python: - - "2.6" - "2.7" - "3.3" - "3.4" diff --git a/README.rst b/README.rst index 1f653d2..c84e445 100644 --- a/README.rst +++ b/README.rst @@ -66,7 +66,7 @@ So you can use it like this: Install ======= -Python versions 2.6, 2.7, 3.3 and 3.4 are supported. +Python versions 2.7, 3.3 and 3.4 are supported. Redis-py versions >= 2.9.1, < 2.11 are supported. .. code:: bash diff --git a/requirements-2.6.txt b/requirements-2.6.txt deleted file mode 100644 index 5ca12b1..0000000 --- a/requirements-2.6.txt +++ /dev/null @@ -1,4 +0,0 @@ --r requirements.txt - -argparse -unittest2 diff --git a/run_tests.py b/run_tests.py index 0fcb280..c78c360 100644 --- a/run_tests.py +++ b/run_tests.py @@ -5,10 +5,7 @@ import importlib import os import sys -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest +import unittest import tests diff --git a/setup.py b/setup.py index 3d0e65c..084753c 100755 --- a/setup.py +++ b/setup.py @@ -23,10 +23,7 @@ def get_requirements(source): return set([str(ir.req) for ir in install_reqs]) -if sys.version_info >= (2, 7): - install_requires = get_requirements('requirements.txt'), -else: - install_requires = get_requirements('requirements-2.6.txt'), +install_requires = get_requirements('requirements.txt'), long_description = codecs.open('README.rst', "r", "utf-8").read() @@ -57,7 +54,6 @@ def get_requirements(source): "Topic :: Software Development :: Libraries :: Python Modules", "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.3", diff --git a/tests/base.py b/tests/base.py index 48eff6e..bad05f2 100644 --- a/tests/base.py +++ b/tests/base.py @@ -3,10 +3,7 @@ from future.builtins import object import sys -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest +import unittest from redis import VERSION as redispy_version diff --git a/tests/collection.py b/tests/collection.py index d0f2908..e239952 100644 --- a/tests/collection.py +++ b/tests/collection.py @@ -2,11 +2,7 @@ from __future__ import absolute_import from __future__ import unicode_literals -import sys -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest +import unittest from redis.exceptions import ResponseError diff --git a/tests/contrib/collection.py b/tests/contrib/collection.py index 143d6d8..cfb473a 100644 --- a/tests/contrib/collection.py +++ b/tests/contrib/collection.py @@ -1,13 +1,8 @@ # -*- coding:utf-8 -*- from __future__ import unicode_literals -import sys -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest - import time +import unittest from limpyd import fields from limpyd.contrib.collection import ExtendedCollectionManager, SORTED_SCORE, DEFAULT_STORE_TTL diff --git a/tests/lock.py b/tests/lock.py index def1374..ba6acd9 100644 --- a/tests/lock.py +++ b/tests/lock.py @@ -4,14 +4,9 @@ from future import standard_library standard_library.install_hooks() -import sys -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest - import threading import time +import unittest from limpyd.utils import make_key from limpyd import fields diff --git a/tests/model.py b/tests/model.py index 1eb106f..48b0ecc 100644 --- a/tests/model.py +++ b/tests/model.py @@ -4,15 +4,10 @@ from future import standard_library standard_library.install_hooks() -import sys -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest - from datetime import datetime import threading import time +import unittest from limpyd import model from limpyd import fields diff --git a/tests/utils.py b/tests/utils.py index 7e1f023..ecee149 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -3,11 +3,7 @@ from __future__ import unicode_literals from future.builtins import str -import sys -if sys.version_info >= (2, 7): - import unittest -else: - import unittest2 as unittest +import unittest from limpyd.utils import make_key, unique_key