diff options
Diffstat (limited to 'numpy/distutils/command')
| -rw-r--r-- | numpy/distutils/command/build_clib.py | 6 | ||||
| -rw-r--r-- | numpy/distutils/command/build_ext.py | 10 | ||||
| -rw-r--r-- | numpy/distutils/command/build_scripts.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/command/build_src.py | 18 | ||||
| -rw-r--r-- | numpy/distutils/command/config.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/command/config_compiler.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/command/install_headers.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/command/sdist.py | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py index 7f7c54d8d..3d278249e 100644 --- a/numpy/distutils/command/build_clib.py +++ b/numpy/distutils/command/build_clib.py @@ -10,9 +10,9 @@ from types import * from distutils.command.build_clib import build_clib as old_build_clib from distutils.command.build_clib import show_compilers -from scipy.distutils import log +from numpy.distutils import log from distutils.dep_util import newer_group -from scipy.distutils.misc_util import filter_sources, has_f_sources,\ +from numpy.distutils.misc_util import filter_sources, has_f_sources,\ has_cxx_sources, all_strings, get_lib_source_files class build_clib(old_build_clib): @@ -71,7 +71,7 @@ class build_clib(old_build_clib): self.compiler.show_customization() if self.have_f_sources(): - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler self.fcompiler = new_fcompiler(compiler=self.fcompiler, verbose=self.verbose, dry_run=self.dry_run, diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 7a2318b70..a7703ea7c 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -10,10 +10,10 @@ from types import * from distutils.dep_util import newer_group, newer from distutils.command.build_ext import build_ext as old_build_ext -from scipy.distutils import log -from scipy.distutils.misc_util import filter_sources, has_f_sources, \ +from numpy.distutils import log +from numpy.distutils.misc_util import filter_sources, has_f_sources, \ has_cxx_sources, get_ext_source_files, all_strings, \ - get_scipy_include_dirs + get_numpy_include_dirs from distutils.errors import DistutilsFileError class build_ext (old_build_ext): @@ -90,7 +90,7 @@ class build_ext (old_build_ext): # Initialize Fortran/C++ compilers if needed. if need_f_compiler: - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler self.fcompiler = new_fcompiler(compiler=self.fcompiler, verbose=self.verbose, dry_run=self.dry_run, @@ -173,7 +173,7 @@ class build_ext (old_build_ext): kws = {'depends':ext.depends} output_dir = self.build_temp - include_dirs = ext.include_dirs + get_scipy_include_dirs() + include_dirs = ext.include_dirs + get_numpy_include_dirs() c_objects = [] if c_sources: diff --git a/numpy/distutils/command/build_scripts.py b/numpy/distutils/command/build_scripts.py index a2dabfa6a..9a8a6bfa8 100644 --- a/numpy/distutils/command/build_scripts.py +++ b/numpy/distutils/command/build_scripts.py @@ -2,7 +2,7 @@ """ from distutils.command.build_scripts import build_scripts as old_build_scripts -from scipy.distutils import log +from numpy.distutils import log class build_scripts(old_build_scripts): @@ -40,5 +40,5 @@ class build_scripts(old_build_scripts): return old_build_scripts.run(self) def get_source_files(self): - from scipy.distutils.misc_util import get_script_files + from numpy.distutils.misc_util import get_script_files return get_script_files(self.scripts) diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index 65b46d173..84cf88b96 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -10,13 +10,13 @@ from distutils.command import build_ext, build_py from distutils.util import convert_path from distutils.dep_util import newer_group, newer -from scipy.distutils import log -from scipy.distutils.misc_util import fortran_ext_match, all_strings, dot_join,\ +from numpy.distutils import log +from numpy.distutils.misc_util import fortran_ext_match, all_strings, dot_join,\ appendpath -from scipy.distutils.from_template import process_file as process_f_file -from scipy.distutils.conv_template import process_file as process_c_file -from scipy.distutils.extension import Extension -from scipy.distutils.system_info import get_info, dict_append +from numpy.distutils.from_template import process_file as process_f_file +from numpy.distutils.conv_template import process_file as process_c_file +from numpy.distutils.extension import Extension +from numpy.distutils.system_info import get_info, dict_append class build_src(build_ext.build_ext): @@ -334,7 +334,7 @@ class build_src(build_ext.build_ext): if (self.force or newer_group(depends, target_file,'newer')) \ and not skip_f2py: log.info("f2py: %s" % (source)) - import scipy.f2py as f2py2e + import numpy.f2py as f2py2e f2py2e.run_main(f2py_options + ['--build-dir',target_dir,source]) else: log.debug(" skipping '%s' f2py interface (up-to-date)" % (source)) @@ -349,7 +349,7 @@ class build_src(build_ext.build_ext): depends = f_sources + extension.depends if (self.force or newer_group(depends, target_file, 'newer')) \ and not skip_f2py: - import scipy.f2py as f2py2e + import numpy.f2py as f2py2e log.info("f2py:> %s" % (target_file)) self.mkpath(target_dir) f2py2e.run_main(f2py_options + ['--lower', @@ -371,7 +371,7 @@ class build_src(build_ext.build_ext): extension.include_dirs.append(self.build_src) if not skip_f2py: - import scipy.f2py as f2py2e + import numpy.f2py as f2py2e d = os.path.dirname(f2py2e.__file__) source_c = os.path.join(d,'src','fortranobject.c') source_h = os.path.join(d,'src','fortranobject.h') diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index aff79067e..fed3a97e5 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -28,7 +28,7 @@ class config(old_config): def _check_compiler (self): old_config._check_compiler(self) - from scipy.distutils.fcompiler import FCompiler, new_fcompiler + from numpy.distutils.fcompiler import FCompiler, new_fcompiler if not isinstance(self.fcompiler, FCompiler): self.fcompiler = new_fcompiler(compiler=self.fcompiler, dry_run=self.dry_run, force=1) diff --git a/numpy/distutils/command/config_compiler.py b/numpy/distutils/command/config_compiler.py index 0db601fc6..c6073e77b 100644 --- a/numpy/distutils/command/config_compiler.py +++ b/numpy/distutils/command/config_compiler.py @@ -44,7 +44,7 @@ class config_fc(Command): def finalize_options(self): if self.help_fcompiler: - from scipy.distutils.fcompiler import show_fcompilers + from numpy.distutils.fcompiler import show_fcompilers show_fcompilers(self.distribution) sys.exit() return diff --git a/numpy/distutils/command/install_headers.py b/numpy/distutils/command/install_headers.py index 043f024f5..6512d5103 100644 --- a/numpy/distutils/command/install_headers.py +++ b/numpy/distutils/command/install_headers.py @@ -13,8 +13,8 @@ class install_headers (old_install_headers): for header in headers: if isinstance(header,tuple): # Kind of a hack, but I don't know where else to change this... - if header[0] == 'scipy.base': - header = ('scipy', header[1]) + if header[0] == 'numpy.base': + header = ('numpy', header[1]) if os.path.splitext(header[1])[1] == '.inc': continue d = os.path.join(*([prefix]+header[0].split('.'))) diff --git a/numpy/distutils/command/sdist.py b/numpy/distutils/command/sdist.py index 289bd0357..a02bdbe45 100644 --- a/numpy/distutils/command/sdist.py +++ b/numpy/distutils/command/sdist.py @@ -1,7 +1,7 @@ from distutils.command.sdist import * from distutils.command.sdist import sdist as old_sdist -from scipy.distutils.misc_util import get_data_files +from numpy.distutils.misc_util import get_data_files class sdist(old_sdist): |