From e3bff88cfb7405d083640c8f5ed8160dd8c6ed14 Mon Sep 17 00:00:00 2001 From: "tim.leslie" <> Date: Sun, 18 Feb 2007 13:08:50 -0700 Subject: [PATCH] move more stuff over to use numpy.distutils including the main setup.py --- lib/neuroimaging/core/setup.py | 2 - lib/neuroimaging/data_io/formats/setup.py | 16 ++++++++ lib/neuroimaging/data_io/setup.py | 14 +++++++ lib/neuroimaging/ui/setup.py | 1 - lib/neuroimaging/utils/setup.py | 3 +- setup.py | 45 +++++++++++++---------- 6 files changed, 58 insertions(+), 23 deletions(-) create mode 100644 lib/neuroimaging/data_io/formats/setup.py create mode 100644 lib/neuroimaging/data_io/setup.py diff --git a/lib/neuroimaging/core/setup.py b/lib/neuroimaging/core/setup.py index 289e2b0e56..0d2b8d0c99 100644 --- a/lib/neuroimaging/core/setup.py +++ b/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') diff --git a/lib/neuroimaging/data_io/formats/setup.py b/lib/neuroimaging/data_io/formats/setup.py new file mode 100644 index 0000000000..82b36d1c5f --- /dev/null +++ b/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()) diff --git a/lib/neuroimaging/data_io/setup.py b/lib/neuroimaging/data_io/setup.py new file mode 100644 index 0000000000..eab4b7bd95 --- /dev/null +++ b/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()) diff --git a/lib/neuroimaging/ui/setup.py b/lib/neuroimaging/ui/setup.py index f3bfa9e4fd..40bc7bbed2 100644 --- a/lib/neuroimaging/ui/setup.py +++ b/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') diff --git a/lib/neuroimaging/utils/setup.py b/lib/neuroimaging/utils/setup.py index 92829c9f7a..314c126d1d 100644 --- a/lib/neuroimaging/utils/setup.py +++ b/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('/')))]) diff --git a/setup.py b/setup.py index 288c307dd4..e4ea84a911 100644 --- a/setup.py +++ b/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__":