From b4a918e4857da7dc662ae1db6f747abefb7c83fe Mon Sep 17 00:00:00 2001 From: Tyler Hobbs Date: Wed, 16 Apr 2014 19:06:33 -0500 Subject: [PATCH] Fix unconditional import of nose in setup.py Fixes #111 --- CHANGELOG.rst | 8 ++++++++ setup.py | 17 ++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 01568398..3e3a151e 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,11 @@ +1.1.1 +===== +April 16, 2014 + +Bug Fixes +--------- +* Fix unconditional import of nose in setup.py (github #111) + 1.1.0 ===== April 16, 2014 diff --git a/setup.py b/setup.py index f4ecfa5e..11f7322d 100644 --- a/setup.py +++ b/setup.py @@ -17,9 +17,11 @@ import sys import ez_setup ez_setup.use_setuptools() +run_gevent_nosetests = False if __name__ == '__main__' and sys.argv[1] == "gevent_nosetests": from gevent.monkey import patch_all patch_all() + run_gevent_nosetests = True from setuptools import setup from distutils.command.build_ext import build_ext @@ -39,8 +41,6 @@ try: except ImportError: has_subprocess = False -from nose.commands import nosetests - from cassandra import __version__ long_description = "" @@ -48,8 +48,12 @@ with open("README.rst") as f: long_description = f.read() -class gevent_nosetests(nosetests): - description = "run nosetests with gevent monkey patching" +gevent_nosetests = None +if run_gevent_nosetests: + from nose.commands import nosetests + + class gevent_nosetests(nosetests): + description = "run nosetests with gevent monkey patching" class DocCommand(Command): @@ -169,7 +173,10 @@ On OSX, via homebrew: def run_setup(extensions): - kw = {'cmdclass': {'doc': DocCommand, 'gevent_nosetests': gevent_nosetests}} + kw = {'cmdclass': {'doc': DocCommand}} + if gevent_nosetests is not None: + kw['cmdclass']['gevent_nosetests'] = gevent_nosetests + if extensions: kw['cmdclass']['build_ext'] = build_extensions kw['ext_modules'] = extensions