diff --git a/dataset/util.py b/dataset/util.py index b4df58b..0a7f11f 100644 --- a/dataset/util.py +++ b/dataset/util.py @@ -3,14 +3,11 @@ try: except ImportError: from urllib.parse import urlparse -try: - from collections import OrderedDict -except ImportError: # pragma: no cover - from ordereddict import OrderedDict +from collections import OrderedDict, Sequence +from hashlib import sha1 from six import string_types -from collections import Sequence -from hashlib import sha1 + QUERY_STEP = 1000 row_type = OrderedDict diff --git a/setup.py b/setup.py index 55261e9..c2a4686 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,6 @@ -import sys from setuptools import setup, find_packages -py26_dependency = [] -if sys.version_info[:2] <= (2, 6): - py26_dependency = ["argparse >= 1.1", "ordereddict >= 1.1"] - setup( name='dataset', version='1.0.2', @@ -36,8 +31,10 @@ setup( 'alembic >= 0.6.2', 'normality >= 0.3.9', "six >= 1.7.3" - ] + py26_dependency, - tests_require=[], + ], + tests_require=[ + 'nose' + ], test_suite='test', entry_points={} )