Change most setup.py files

10 files changed, 76 insertions, 51 deletions

diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 5f0e0fa94..381bb3753 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -6,10 +6,10 @@ from glob import glob
 from distutils.dep_util import newer,newer_group
 
 def configuration(parent_package='',top_path=None):
-    from scipy.distutils.misc_util import Configuration,dot_join
-    from scipy.distutils.system_info import get_info
+    from numpy.distutils.misc_util import Configuration,dot_join
+    from numpy.distutils.system_info import get_info
 
-    config = Configuration('base',parent_package,top_path)
+    config = Configuration('core',parent_package,top_path)
     local_dir = config.local_path
     codegen_dir = join(local_dir,'code_generators')
 
@@ -19,7 +19,7 @@ def configuration(parent_package='',top_path=None):
                                      open(generate_umath_py,'U'),generate_umath_py,
                                      ('.py','U',1))
 
-    header_dir = join(*(config.name.split('.')+['include','scipy']))
+    header_dir = join(*(config.name.split('.')+['include','numpy']))
 
     def generate_config_h(ext, build_dir):
         target = join(build_dir,'config.h')
@@ -90,8 +90,8 @@ def configuration(parent_package='',top_path=None):
         ext.libraries.extend(mathlibs)
 
         incl_dir = os.path.dirname(target)
-        if incl_dir not in config.scipy_include_dirs:
-            config.scipy_include_dirs.append(incl_dir)
+        if incl_dir not in config.numpy_include_dirs:
+            config.numpy_include_dirs.append(incl_dir)
 
         config.add_data_files((header_dir,target))
         return target
@@ -127,16 +127,16 @@ def configuration(parent_package='',top_path=None):
             f.close()
         return []
 
-    config.add_data_files(join('include','scipy','*.h'))
+    config.add_data_files(join('include','numpy','*.h'))
     config.add_include_dirs('src')
 
-    config.scipy_include_dirs.extend(config.paths('include'))
+    config.numpy_include_dirs.extend(config.paths('include'))
 
     deps = [join('src','arrayobject.c'),
             join('src','arraymethods.c'),
             join('src','scalartypes.inc.src'),
             join('src','arraytypes.inc.src'),
-            join('include','scipy','*object.h'),
+            join('include','numpy','*object.h'),
 	    join(codegen_dir,'genapi.py'),
 	    join(codegen_dir,'*.txt')
             ]
@@ -167,13 +167,6 @@ def configuration(parent_package='',top_path=None):
                                     ]+deps,
                          )
 
-    config.add_extension('_compiled_base',
-                         sources=[join('src','_compiled_base.c'),
-                                  generate_config_h,
-                                  generate_array_api,
-                                  ],
-                         )
-
     config.add_extension('_sort',
                          sources=[join('src','_sortmodule.c.src'),
                                   generate_config_h,
@@ -280,5 +273,5 @@ int main(int argc, char **argv)
     return testcode
 
 if __name__=='__main__':
-    from scipy.distutils.core import setup
+    from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())
diff --git a/numpy/dft/setup.py b/numpy/dft/setup.py
index 5ff44f37f..2ec72619f 100644
--- a/numpy/dft/setup.py
+++ b/numpy/dft/setup.py
@@ -2,8 +2,8 @@
 from os.path import join
 
 def configuration(parent_package='',top_path=None):
-    from scipy.distutils.misc_util import Configuration
-    config = Configuration('corefft',parent_package,top_path)
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('dft',parent_package,top_path)
 
     config.add_data_dir('tests')
 
@@ -16,5 +16,5 @@ def configuration(parent_package='',top_path=None):
     return config
 
 if __name__ == '__main__':
-    from scipy.distutils.core import setup
+    from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())
diff --git a/numpy/lib/convertcode.py b/numpy/lib/convertcode.py
index 5c532b394..aba998f78 100644
--- a/numpy/lib/convertcode.py
+++ b/numpy/lib/convertcode.py
@@ -90,20 +90,20 @@ def replaceother(astr):
 import datetime
 def fromstr(filestr):
     filestr = replacetypechars(filestr)
-    filestr, fromall1 = changeimports(filestr, 'Numeric', 'scipy')
+    filestr, fromall1 = changeimports(filestr, 'Numeric', 'numpy')
     filestr, fromall1 = changeimports(filestr, 'multiarray',
-                                      'scipy.base.multiarray')
+                                      'numpy.core.multiarray')
     filestr, fromall1 = changeimports(filestr, 'umath',
-                                          'scipy.base.umath')
-    filestr, fromall1 = changeimports(filestr, 'Precision', 'scipy.base')
-    filestr, fromall2 = changeimports(filestr, 'numerix', 'scipy.base')
-    filestr, fromall3 = changeimports(filestr, 'scipy_base', 'scipy.base')
-    filestr, fromall3 = changeimports(filestr, 'MLab', 'scipy.base.mlab')
-    filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'scipy.corelinalg')
-    filestr, fromall3 = changeimports(filestr, 'RNG', 'scipy.random')
-    filestr, fromall3 = changeimports(filestr, 'RandomArray', 'scipy.random')
-    filestr, fromall3 = changeimports(filestr, 'FFT', 'scipy.corefft')
-    filestr, fromall3 = changeimports(filestr, 'MA', 'scipy.base.ma')
+                                          'numpy.core.umath')
+    filestr, fromall1 = changeimports(filestr, 'Precision', 'numpy.core')
+    filestr, fromall2 = changeimports(filestr, 'numerix', 'numpy.core')
+    filestr, fromall3 = changeimports(filestr, 'scipy_base', 'numpy.core')
+    filestr, fromall3 = changeimports(filestr, 'MLab', 'numpy.core.mlab')
+    filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'numpy.linalg')
+    filestr, fromall3 = changeimports(filestr, 'RNG', 'numpy.random')
+    filestr, fromall3 = changeimports(filestr, 'RandomArray', 'numpy.random')
+    filestr, fromall3 = changeimports(filestr, 'FFT', 'numpy.dft')
+    filestr, fromall3 = changeimports(filestr, 'MA', 'numpy.core.ma')
     fromall = fromall1 or fromall2 or fromall3
     filestr = replaceattr(filestr)
     filestr = replaceother(filestr)
diff --git a/numpy/lib/setup.py b/numpy/lib/setup.py
new file mode 100644
index 000000000..7e3eeb030
--- /dev/null
+++ b/numpy/lib/setup.py
@@ -0,0 +1,31 @@
+
+import imp
+import os
+from os.path import join
+from glob import glob
+from distutils.dep_util import newer,newer_group
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration,dot_join
+    from numpy.distutils.system_info import get_info
+
+    config = Configuration('lib',parent_package,top_path)
+    local_dir = config.local_path
+
+    config.add_include_dirs(join('..','core','include'))
+
+
+    config.add_extension('_compiled_base',
+                         sources=[join('src','_compiled_base.c'),
+                                  generate_config_h,
+                                  generate_array_api,
+                                  ],
+                         )
+
+    config.add_data_dir('tests')
+
+    return config
+
+if __name__=='__main__':
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())
diff --git a/numpy/testing/test_type_check.py b/numpy/lib/tests/test_type_check.py
index aac24bd6e..aac24bd6e 100644
--- a/numpy/testing/test_type_check.py
+++ b/numpy/lib/tests/test_type_check.py
diff --git a/numpy/core/tests/test_ufunclike.py b/numpy/lib/tests/test_ufunclike.py
index ca06140c7..ca06140c7 100644
--- a/numpy/core/tests/test_ufunclike.py
+++ b/numpy/lib/tests/test_ufunclike.py
diff --git a/numpy/linalg/setup.py b/numpy/linalg/setup.py
index b1a8c6c67..c68023a7f 100644
--- a/numpy/linalg/setup.py
+++ b/numpy/linalg/setup.py
@@ -2,9 +2,9 @@
 from os.path import join
 
 def configuration(parent_package='',top_path=None):
-    from scipy.distutils.misc_util import Configuration
-    from scipy.distutils.system_info import get_info
-    config = Configuration('corelinalg',parent_package,top_path)
+    from numpy.distutils.misc_util import Configuration
+    from numpy.distutils.system_info import get_info
+    config = Configuration('linalg',parent_package,top_path)
 
     # Configure lapack_lite
     lapack_info = get_info('lapack_opt',0)
@@ -27,5 +27,5 @@ def configuration(parent_package='',top_path=None):
     return config
 
 if __name__ == '__main__':
-    from scipy.distutils.core import setup
+    from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())
diff --git a/numpy/random/setup.py b/numpy/random/setup.py
index 17e5e0133..7cb7d2167 100644
--- a/numpy/random/setup.py
+++ b/numpy/random/setup.py
@@ -2,7 +2,7 @@
 from os.path import join
 
 def configuration(parent_package='',top_path=None):
-    from scipy.distutils.misc_util import Configuration
+    from numpy.distutils.misc_util import Configuration
     config = Configuration('random',parent_package,top_path)
 
     # Configure mtrand
@@ -20,5 +20,5 @@ def configuration(parent_package='',top_path=None):
     return config
 
 if __name__ == '__main__':
-    from scipy.distutils.core import setup
+    from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())
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=''))
diff --git a/numpy/testing/utils.py b/numpy/testing/utils.py
index 362f30fec..a7d303973 100644
--- a/numpy/testing/utils.py
+++ b/numpy/testing/utils.py
@@ -17,7 +17,7 @@ def rand(*args):
     This only uses the standard library, so it is useful for testing purposes. 
     """
     import random
-    from scipy.base import zeros, Float64
+    from numpy.core import zeros, Float64
     results = zeros(args,Float64)
     f = results.flat
     for i in range(len(f)):
@@ -64,7 +64,7 @@ def assert_equal(actual,desired,err_msg='',verbose=1):
     """ Raise an assertion if two items are not
         equal.  I think this should be part of unittest.py
     """
-    from scipy.base import ArrayType
+    from numpy.core import ArrayType
     if isinstance(actual, ArrayType) or isinstance(desired, ArrayType):
         return assert_array_equal(actual, desired, err_msg)
     msg = '\nItems are not equal:\n' + err_msg
@@ -84,7 +84,7 @@ def assert_almost_equal(actual,desired,decimal=7,err_msg='',verbose=1):
     """ Raise an assertion if two items are not
         equal.  I think this should be part of unittest.py
     """
-    from scipy.base import ArrayType
+    from numpy.core import ArrayType
     if isinstance(actual, ArrayType) or isinstance(desired, ArrayType):
         return assert_array_almost_equal(actual, desired, decimal, err_msg)
     msg = '\nItems are not equal:\n' + err_msg
@@ -134,7 +134,7 @@ def assert_approx_equal(actual,desired,significant=7,err_msg='',verbose=1):
 
 
 def assert_array_equal(x,y,err_msg=''):
-    from scipy.base import asarray, alltrue, equal, shape, ravel, array2string
+    from numpy.core import asarray, alltrue, equal, shape, ravel, array2string
     x,y = asarray(x), asarray(y)
     msg = '\nArrays are not equal'
     try:
@@ -159,7 +159,7 @@ def assert_array_equal(x,y,err_msg=''):
 
 
 def assert_array_almost_equal(x,y,decimal=6,err_msg=''):
-    from scipy.base import asarray, alltrue, equal, shape, ravel,\
+    from numpy.core import asarray, alltrue, equal, shape, ravel,\
          array2string, less_equal, around
     x = asarray(x)
     y = asarray(y)
@@ -188,7 +188,7 @@ def assert_array_almost_equal(x,y,decimal=6,err_msg=''):
         raise ValueError, 'arrays are not almost equal'
 
 def assert_array_less(x,y,err_msg=''):
-    from scipy.base import asarray, alltrue, less, equal, shape, ravel, array2string
+    from numpy.core import asarray, alltrue, less, equal, shape, ravel, array2string
     x,y = asarray(x), asarray(y)
     msg = '\nArrays are not less-ordered'
     try: