setupegg.py @@ -1,16 +1,15 @@ import sys from distutils.core import * -try: + +if 'setuptools' in sys.modules: + have_setuptools = True from setuptools import setup as old_setup - # very old setuptools don't have this - from setuptools.command import bdist_egg # easy_install imports math, it may be picked up from cwd from setuptools.command import develop, easy_install - have_setuptools = 1 -except ImportError: +else: from distutils.core import setup as old_setup - have_setuptools = 0 + have_setuptools = False from numpy.distutils.extension import Extension from numpy.distutils.command import config numpy/distutils/core.py 9975e79826284c7d39e9ca09cec14c690a0984e4 cookedm cookedm@94b884b6-d6fd-0310-90d3-974f1d3f35e1 http://github.com/cournape/numpy/commit/6041bd1637c407fab22154c8499e3adef4bd9122 6041bd1637c407fab22154c8499e3adef4bd9122 2006-06-28T12:05:48-07:00 2006-06-28T12:05:48-07:00 Don't import setuptools by default, but do use it if it has been imported. The setupegg.py script can be used instead of setup.py to use setuptools. git-svn-id: http://svn.scipy.org/svn/numpy/trunk@2699 94b884b6-d6fd-0310-90d3-974f1d3f35e1 1d436e1e19ceeb73cbdf11056a292a0bdc9a8f45 cookedm cookedm@94b884b6-d6fd-0310-90d3-974f1d3f35e1