Remove Python 2.6 support code

Browse Source
This commit is contained in:
Stefan Wehrmeyer 2017-09-29 14:11:07 +02:00
parent 1fd2a15273
commit da901efbf7
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dataset/util.py
View File

@ -3,14 +3,11 @@ try:
except ImportError: except ImportError:
from urllib.parse import urlparse from urllib.parse import urlparse
try: from collections import OrderedDict, Sequence
from collections import OrderedDict from hashlib import sha1
except ImportError: # pragma: no cover
from ordereddict import OrderedDict
from six import string_types from six import string_types
from collections import Sequence
from hashlib import sha1
QUERY_STEP = 1000 QUERY_STEP = 1000
row_type = OrderedDict row_type = OrderedDict

11
setup.py
View File

@ -1,11 +1,6 @@
import sys
from setuptools import setup, find_packages from setuptools import setup, find_packages
py26_dependency = []
if sys.version_info[:2] <= (2, 6):
py26_dependency = ["argparse >= 1.1", "ordereddict >= 1.1"]
setup( setup(
name='dataset', name='dataset',
version='1.0.2', version='1.0.2',
@ -36,8 +31,10 @@ setup(
'alembic >= 0.6.2', 'alembic >= 0.6.2',
'normality >= 0.3.9', 'normality >= 0.3.9',
"six >= 1.7.3" "six >= 1.7.3"
] + py26_dependency, ],
tests_require=[], tests_require=[
'nose'
],
test_suite='test', test_suite='test',
entry_points={} entry_points={}
) )