From 1492f618cb0e73532a2b4eafe59da64c31af402a Mon Sep 17 00:00:00 2001 From: Mathieu Agopian Date: Sat, 8 Sep 2012 12:10:14 +0200 Subject: [PATCH 1/2] adds test_suite and tests_require in setup.py --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index dee5365..bcb483e 100755 --- a/setup.py +++ b/setup.py @@ -32,4 +32,6 @@ setup( "Programming Language :: Python", "Topic :: Software Development", "Topic :: Utilities", - ]) + ], + tests_require=['nose'], + test_suite='nose.collector',) From 7be297cd1ea7fbf0c122019f30e53dd61965cc07 Mon Sep 17 00:00:00 2001 From: Mathieu Agopian Date: Wed, 12 Sep 2012 11:39:36 +0200 Subject: [PATCH 2/2] test_suite and tests_require only available when using setuptools --- setup.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index bcb483e..d3ceddd 100755 --- a/setup.py +++ b/setup.py @@ -2,11 +2,16 @@ import sys ispy3 = sys.version_info[0] == 3 +kwargs = {} if ispy3: from distutils.core import setup # NOQA else: try: from setuptools import setup # NOQA + kwargs = { + 'tests_require': ['nose'], + 'test_suite': 'nose.collector', + } except ImportError: from distutils.core import setup # NOQA @@ -33,5 +38,4 @@ setup( "Topic :: Software Development", "Topic :: Utilities", ], - tests_require=['nose'], - test_suite='nose.collector',) + **kwargs)