diff --git a/setup.py b/setup.py index 525b226..7d912c8 100644 --- a/setup.py +++ b/setup.py @@ -13,11 +13,17 @@ install_requires = [ "six", ] +tests_require = [ + 'nose', +] -if sys.version_info[0] ==2 and sys.version_info[1] < 7: +if sys.version_info[0] == 2 and sys.version_info[1] < 7: install_requires.extend([ 'ordereddict', ]) + tests_require.extend([ + 'unittest2', + ]) setup(name='taskw', version=version, @@ -44,7 +50,7 @@ zip_safe=False, install_requires=install_requires, test_suite='nose.collector', - tests_require=['nose'], + tests_require=tests_require, entry_points=""" # -*- Entry points: -*- """, diff --git a/taskw/test/test_datas.py b/taskw/test/test_datas.py index cd02c6c..0aca8eb 100644 --- a/taskw/test/test_datas.py +++ b/taskw/test/test_datas.py @@ -6,6 +6,12 @@ from taskw import TaskWarrior, TaskWarriorExperimental +# Python 2.6 can't handle fancy unit test stuff. +if sys.version_info[0] == 2 and sys.version_info[1] < 7: + import unittest2 as unittest +else: + import unittest + TASK = {'description': "task 2 http://www.google.com/", 'entry': "1325011643", 'project': "work",