From c14d4fe25cb5cd482369734dd487ac8f376851c9 Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Wed, 4 Jan 2006 17:47:13 +0000 Subject: Change most setup.py files --- numpy/setup.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'numpy/setup.py') diff --git a/numpy/setup.py b/numpy/setup.py index 491e288a9..b01940edd 100644 --- a/numpy/setup.py +++ b/numpy/setup.py @@ -2,14 +2,15 @@ import os def configuration(parent_package='',top_path=None): - from scipy.distutils.misc_util import Configuration - config = Configuration('scipy',parent_package,top_path) + from numpy.distutils.misc_util import Configuration + config = Configuration('numpy',parent_package,top_path) config.add_subpackage('distutils') config.add_subpackage('testing') config.add_subpackage('f2py') - config.add_subpackage('base') - config.add_subpackage('corefft') - config.add_subpackage('corelinalg') + config.add_subpackage('core') + config.add_subpackage('lib') + config.add_subpackage('dft') + config.add_subpackage('linalg') config.add_subpackage('random') config.add_data_dir('doc') config.make_config_py(name='__core_config__') # installs __core_config__.py @@ -18,9 +19,9 @@ def configuration(parent_package='',top_path=None): if __name__ == '__main__': # Remove current working directory from sys.path - # to avoid importing scipy.distutils as Python std. distutils: + # to avoid importing numpy.distutils as Python std. distutils: import os, sys sys.path.remove(os.getcwd()) - from scipy.distutils.core import setup + from numpy.distutils.core import setup setup(**configuration(top_path='')) -- cgit v1.2.1