From 008775853fb1a4e0a648f26dfe7cceb60ced7a76 Mon Sep 17 00:00:00 2001 From: Juan Nunez-Iglesias Date: Tue, 3 Feb 2015 15:34:56 +1100 Subject: [PATCH] Fix setup.py cascade --- skimage/future/graph/setup.py | 30 ++++++++++++++++++++++++++++++ skimage/future/setup.py | 12 ++++++++++++ skimage/graph/setup.py | 3 --- skimage/setup.py | 1 + 4 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 skimage/future/graph/setup.py create mode 100644 skimage/future/setup.py diff --git a/skimage/future/graph/setup.py b/skimage/future/graph/setup.py new file mode 100644 index 00000000..059a0779 --- /dev/null +++ b/skimage/future/graph/setup.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python + +from skimage._build import cython +import os.path + +base_path = os.path.abspath(os.path.dirname(__file__)) + + +def configuration(parent_package='', top_path=None): + from numpy.distutils.misc_util import Configuration, get_numpy_include_dirs + + config = Configuration('graph', parent_package, top_path) + config.add_data_dir('tests') + + # This function tries to create C files from the given .pyx files. If + # it fails, try to build with pre-generated .c files. + cython(['_ncut_cy.pyx'], working_path=base_path) + config.add_extension('_ncut_cy', sources=['_ncut_cy.c'], + include_dirs=[get_numpy_include_dirs()]) + return config + +if __name__ == '__main__': + from numpy.distutils.core import setup + setup(maintainer='scikit-image Developers', + maintainer_email='scikit-image@googlegroups.com', + description='Graph-based Image-processing Algorithms', + url='https://github.com/scikit-image/scikit-image', + license='Modified BSD', + **(configuration(top_path='').todict()) + ) diff --git a/skimage/future/setup.py b/skimage/future/setup.py new file mode 100644 index 00000000..aaded0c7 --- /dev/null +++ b/skimage/future/setup.py @@ -0,0 +1,12 @@ + +def configuration(parent_package='skimage', top_path=None): + from numpy.distutils.misc_util import Configuration + config = Configuration('future', parent_package, top_path) + config.add_subpackage('graph') + return config + +if __name__ == "__main__": + from numpy.distutils.core import setup + + config = configuration(top_path='').todict() + setup(**config) diff --git a/skimage/graph/setup.py b/skimage/graph/setup.py index edc7b653..4c6aba06 100644 --- a/skimage/graph/setup.py +++ b/skimage/graph/setup.py @@ -17,7 +17,6 @@ def configuration(parent_package='', top_path=None): cython(['_spath.pyx'], working_path=base_path) cython(['_mcp.pyx'], working_path=base_path) cython(['heap.pyx'], working_path=base_path) - cython(['_ncut_cy.pyx'], working_path=base_path) config.add_extension('_spath', sources=['_spath.c'], include_dirs=[get_numpy_include_dirs()]) @@ -25,8 +24,6 @@ def configuration(parent_package='', top_path=None): include_dirs=[get_numpy_include_dirs()]) config.add_extension('heap', sources=['heap.c'], include_dirs=[get_numpy_include_dirs()]) - config.add_extension('_ncut_cy', sources=['_ncut_cy.c'], - include_dirs=[get_numpy_include_dirs()]) return config if __name__ == '__main__': diff --git a/skimage/setup.py b/skimage/setup.py index 94d00ea8..b33f5e81 100644 --- a/skimage/setup.py +++ b/skimage/setup.py @@ -14,6 +14,7 @@ def configuration(parent_package='', top_path=None): config.add_subpackage('feature') config.add_subpackage('restoration') config.add_subpackage('filters') + config.add_subpackage('future') config.add_subpackage('graph') config.add_subpackage('io') config.add_subpackage('measure')