From d9efa0bc6c85317d847de4d8b865c2e41cf75da1 Mon Sep 17 00:00:00 2001 From: Olivier Debeir Date: Fri, 5 Oct 2012 11:28:27 +0200 Subject: [PATCH] update setup to be compatible with scikits-image --- skimage/rank/setup.py | 114 +++++++++++++++++++++--------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/skimage/rank/setup.py b/skimage/rank/setup.py index 581e64ed..4f57209a 100644 --- a/skimage/rank/setup.py +++ b/skimage/rank/setup.py @@ -1,59 +1,59 @@ -import numpy as np - -from distutils.core import setup -from distutils.extension import Extension -from Cython.Distutils import build_ext - -setup( - cmdclass = {'build_ext': build_ext}, - ext_modules = [Extension("_crank8", ["_crank8.pyx"], include_dirs=[np.get_include()]), - Extension("_crank8_percentiles", ["_crank8_percentiles.pyx"], include_dirs=[np.get_include()]), - Extension("_crank16", ["_crank16.pyx"], include_dirs=[np.get_include()]), - Extension("_crank16_bilateral", ["_crank16_bilateral.pyx"], include_dirs=[np.get_include()]), - Extension("_crank16_percentiles", ["_crank16_percentiles.pyx"], include_dirs=[np.get_include()])] -) +#import numpy as np +# +#from distutils.core import setup +#from distutils.extension import Extension +#from Cython.Distutils import build_ext +# +#setup( +# cmdclass = {'build_ext': build_ext}, +# ext_modules = [Extension("_crank8", ["_crank8.pyx"], include_dirs=[np.get_include()]), +# Extension("_crank8_percentiles", ["_crank8_percentiles.pyx"], include_dirs=[np.get_include()]), +# Extension("_crank16", ["_crank16.pyx"], include_dirs=[np.get_include()]), +# Extension("_crank16_bilateral", ["_crank16_bilateral.pyx"], include_dirs=[np.get_include()]), +# Extension("_crank16_percentiles", ["_crank16_percentiles.pyx"], include_dirs=[np.get_include()])] +#) -##!/usr/bin/env python -# -#import os -#from skimage._build import cython -# -#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('rank', parent_package, top_path) -## config.add_data_dir('tests') -# -# cython(['_crank8.pyx'], working_path=base_path) -# cython(['_crank8_percentiles.pyx'], working_path=base_path) -# cython(['_crank16.pyx'], working_path=base_path) -# cython(['_crank16_percentiles.pyx'], working_path=base_path) -# cython(['_crank16_bilateral.pyx'], working_path=base_path) -# -# config.add_extension('_crank8', sources=['_crank8.c'], -# include_dirs=[get_numpy_include_dirs()]) -# config.add_extension('_crank8_percentiles', sources=['_crank8_percentiles.c'], -# include_dirs=[get_numpy_include_dirs()]) -# config.add_extension('_crank16', sources=['_crank16.c'], -# include_dirs=[get_numpy_include_dirs()]) -# config.add_extension('_crank16_percentiles', sources=['_crank16_percentiles.c'], -# include_dirs=[get_numpy_include_dirs()]) -# config.add_extension('_crank16_bilateral', sources=['_crank16_bilateral.c'], -# include_dirs=[get_numpy_include_dirs()]) -# -# return config -# -#if __name__ == '__main__': -# from numpy.distutils.core import setup -# setup(maintainer='scikits-image Developers', -# author='Olivier Debeir', -# maintainer_email='scikits-image@googlegroups.com', -# description='Rank filters', -# url='https://github.com/scikits-image/scikits-image', -# license='SciPy License (BSD Style)', -# **(configuration(top_path='').todict()) -# ) +#!/usr/bin/env python + +import os +from skimage._build import cython + +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('rank', parent_package, top_path) +# config.add_data_dir('tests') + + cython(['_crank8.pyx'], working_path=base_path) + cython(['_crank8_percentiles.pyx'], working_path=base_path) + cython(['_crank16.pyx'], working_path=base_path) + cython(['_crank16_percentiles.pyx'], working_path=base_path) + cython(['_crank16_bilateral.pyx'], working_path=base_path) + + config.add_extension('_crank8', sources=['_crank8.c'], + include_dirs=[get_numpy_include_dirs()]) + config.add_extension('_crank8_percentiles', sources=['_crank8_percentiles.c'], + include_dirs=[get_numpy_include_dirs()]) + config.add_extension('_crank16', sources=['_crank16.c'], + include_dirs=[get_numpy_include_dirs()]) + config.add_extension('_crank16_percentiles', sources=['_crank16_percentiles.c'], + include_dirs=[get_numpy_include_dirs()]) + config.add_extension('_crank16_bilateral', sources=['_crank16_bilateral.c'], + include_dirs=[get_numpy_include_dirs()]) + + return config + +if __name__ == '__main__': + from numpy.distutils.core import setup + setup(maintainer='scikits-image Developers', + author='Olivier Debeir', + maintainer_email='scikits-image@googlegroups.com', + description='Rank filters', + url='https://github.com/scikits-image/scikits-image', + license='SciPy License (BSD Style)', + **(configuration(top_path='').todict()) + )