move more stuff over to use numpy.distutils including the main setup.py

lib/neuroimaging/core/setup.py

@@ -2,8 +2,6 @@ def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('core', parent_package, top_path)
 
-    config.add_data_dir('tests')
-
     config.add_subpackage('image')
     config.add_subpackage('reference')
 

lib/neuroimaging/data_io/formats/setup.py

@@ -0,0 +1,16 @@
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('formats', parent_package, top_path)
+
+    config.add_data_dir('tests')
+
+    from nifti1_ext import extension
+    name, source, d = extension
+
+    config.add_extension(name, source, **d)
+
+    return config
+
+if __name__ == '__main__':
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())

lib/neuroimaging/data_io/setup.py

@@ -0,0 +1,14 @@
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+    config = Configuration('data_io', parent_package, top_path)
+
+    config.add_data_dir('tests')
+
+    config.add_subpackage('formats')
+
+
+    return config
+
+if __name__ == '__main__':
+    from numpy.distutils.core import setup
+    setup(**configuration(top_path='').todict())

lib/neuroimaging/ui/setup.py

@@ -2,7 +2,6 @@ def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('ui', parent_package, top_path)
 
-    config.add_data_dir('tests')
 
     config.add_subpackage('visualization')
 

lib/neuroimaging/utils/setup.py

@@ -1,3 +1,4 @@
+from os.path import join
 from neuroimaging import ENTHOUGHT_TRAITS_DEF
 
 
@@ -12,7 +13,7 @@ def configuration(parent_package='',top_path=None):
 
     if not ENTHOUGHT_TRAITS_DEF:
         print "yo"
-        config.add_subpackage('enthough')
+        config.add_subpackage('enthought')
         config.add_extension('enthought.traits.ctraits',
           [join(*('enthought/traits/ctraits.c'.split('/')))])
 

setup.py

@@ -1,32 +1,39 @@
 from os.path import join
 import sys
 sys.path.insert(0,"lib")
-from distutils.core import setup, Extension
+
 from numpy.distutils.misc_util import get_numpy_include_dirs
 
 from neuroimaging import packages, __version__, __doc__, ENTHOUGHT_TRAITS_DEF
 
+
+def configuration(parent_package='',top_path=None):
+    from numpy.distutils.misc_util import Configuration
+
+    config = Configuration(None, parent_package, top_path)
+    config.set_options(ignore_setup_xxx_py=True,
+                       assume_default_configuration=True,
+                       delegate_options_to_subpackages=True,
+                       quiet=True)
+
+    config.add_subpackage('algorithms', 'lib/neuroimaging/core')
+    config.add_subpackage('core', 'lib/neuroimaging/core')
+    config.add_subpackage('data_io', 'lib/neuroimaging/data_io')
+    config.add_subpackage('modalities', 'lib/neuroimaging/modalities')
+    config.add_subpackage('ui', 'lib/neuroimaging/ui')
+    config.add_subpackage('utils', 'lib/neuroimaging/utils')            
+
+    return config
+
+
+
 def main(packages):
-
-    packages = ['']+list(packages)
-#    ext_modules = [Extension('data_io.formats.minc._mincutils',
-#      [join(*('lib/neuroimaging/data_io/formats/minc/_mincutils.c'.split('/')))],
-#      extra_link_args=["-lminc"],
-#     include_dirs=get_numpy_include_dirs())]
+    from numpy.distutils.core import setup
 
-    ext_modules = []
-    from neuroimaging.data_io.formats.nifti1_ext import extension
-    name, source, d = extension
-    name = "data_io.formats.%s" % name
-    ext_modules = [Extension(name, source, **d)]
+    packages = ['']+list(packages)
 
     package_dir = {'': 'lib'}
 
-    if not ENTHOUGHT_TRAITS_DEF:
-        ext_modules += [Extension('utils.enthought.traits.ctraits',
-          [join(*('lib/neuroimaging/utils/enthought/traits/ctraits.c'.split('/')))])]
-        package_dir['neuroimaging.utils.enthought'] = \
-          join(*('lib/neuroimaging/utils/enthought/'.split('/')))
 
     setup( name = 'neuroimaging',
            version = __version__,
@@ -35,10 +42,10 @@ def main(packages):
            author_email = 'nipy-devel@neuroimaging.scipy.org',
            ext_package = 'neuroimaging',
            packages=packages,
-           ext_modules=ext_modules,
            package_dir = package_dir,
            url = 'http://neuroimaging.scipy.org',
-           long_description = __doc__)
+           long_description = __doc__,
+           configuration = configuration)
 
 
 if __name__ == "__main__":