Skip to content

Commit

Permalink
Remove support for python 2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
twidi committed Feb 15, 2017
1 parent f5052f7 commit a45ea21
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 47 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ cache:
- $HOME/.cache/pip

python:
- "2.6"
- "2.7"
- "3.3"
- "3.4"
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions requirements-2.6.txt

This file was deleted.

5 changes: 1 addition & 4 deletions run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 1 addition & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 1 addition & 4 deletions tests/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 1 addition & 5 deletions tests/collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 1 addition & 6 deletions tests/contrib/collection.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 1 addition & 6 deletions tests/lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions tests/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions tests/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit a45ea21

Please sign in to comment.