From 2d6014e3566ee110658cfd09e7af38e6b1f85848 Mon Sep 17 00:00:00 2001
From: Olivier Debeir <odebeir@ulb.ac.be>
Date: Thu, 4 Oct 2012 17:15:10 +0200
Subject: [PATCH] try to fix rank setup

---
 skimage/rank/setup.py                     | 27 +++++++++++++++--------
 skimage/rank/tests/test_16bitbilateral.py |  3 ++-
 skimage/setup.py                          |  1 +
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/skimage/rank/setup.py b/skimage/rank/setup.py
index e8b2691d..c16f902f 100644
--- a/skimage/rank/setup.py
+++ b/skimage/rank/setup.py
@@ -26,24 +26,33 @@ setup(
 #    from numpy.distutils.misc_util import Configuration, get_numpy_include_dirs
 #
 #    config = Configuration('rank', parent_package, top_path)
-#    config.add_data_dir('tests')
+##    config.add_data_dir('tests')
 #
-#    cython(['_texture.pyx'], working_path=base_path)
-#    cython(['_template.pyx'], working_path=base_path)
+#    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('_texture', sources=['_texture.c'],
-#        include_dirs=[get_numpy_include_dirs(), '../_shared'])
-#    config.add_extension('_template', sources=['_template.c'],
-#        include_dirs=[get_numpy_include_dirs(), '../_shared'])
+#    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='scikits-image Developers',
+#        author='Olivier Debeir',
 #        maintainer_email='scikits-image@googlegroups.com',
-#        description='Features',
+#        description='Rank filters',
 #        url='https://github.com/scikits-image/scikits-image',
 #        license='SciPy License (BSD Style)',
 #        **(configuration(top_path='').todict())
diff --git a/skimage/rank/tests/test_16bitbilateral.py b/skimage/rank/tests/test_16bitbilateral.py
index 98d76573..8001a25f 100644
--- a/skimage/rank/tests/test_16bitbilateral.py
+++ b/skimage/rank/tests/test_16bitbilateral.py
@@ -2,7 +2,8 @@ import numpy as np
 import matplotlib.pyplot as plt
 
 from skimage import data
-from skimage.rank import crank8_percentiles,crank16_bilateral
+from skimage.rank import crank8_percentiles
+from skimage.rank import crank16_bilateral
 
 if __name__ == '__main__':
     a8 = (data.coins()).astype('uint8')
diff --git a/skimage/setup.py b/skimage/setup.py
index 1082ba07..7ed50b65 100644
--- a/skimage/setup.py
+++ b/skimage/setup.py
@@ -16,6 +16,7 @@ def configuration(parent_package='', top_path=None):
     config.add_subpackage('io')
     config.add_subpackage('measure')
     config.add_subpackage('morphology')
+    config.add_subpackage('rank')
     config.add_subpackage('transform')
     config.add_subpackage('util')
     config.add_subpackage('segmentation')