diff --git a/setup.py b/setup.py index d5d3917..fad9bb6 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,13 @@ +import sys from setuptools import setup, find_packages import md5 # fix for "No module named _md5" error +requirements = [] +if sys.version_info < (2, 7): + requirements.append('ordereddict') + + setup(name='expiringdict', version='1.0', description="Dictionary with auto-expiring values for caching purposes", @@ -13,4 +19,5 @@ packages=find_packages(exclude=['tests']), include_package_data=True, zip_safe=True, + install_requires=requirements, extras_require={'test': ['nose', 'mock', 'coverage']}) diff --git a/tox.ini b/tox.ini index 45715f2..5bb71f7 100644 --- a/tox.ini +++ b/tox.ini @@ -11,8 +11,3 @@ commands = nosetests deps = nose mock - -[testenv:py26] -deps = - {[testenv]deps} - ordereddict