From cdfa2a6d90befbb84c38af013f0f25960d45043c Mon Sep 17 00:00:00 2001
From: Olivier Debeir <odebeir@ulb.ac.be>
Date: Mon, 29 Oct 2012 09:21:10 +0100
Subject: [PATCH] move setup from /filter/rank to /filter

---
 skimage/filter/rank/setup.py | 52 ------------------------------------
 skimage/filter/setup.py      | 28 +++++++++++++++++--
 2 files changed, 26 insertions(+), 54 deletions(-)
 delete mode 100644 skimage/filter/rank/setup.py

diff --git a/skimage/filter/rank/setup.py b/skimage/filter/rank/setup.py
deleted file mode 100644
index c6a3dbb9..00000000
--- a/skimage/filter/rank/setup.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/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(['_core8.pyx'], working_path=base_path)
-    cython(['_core16.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('_core8', sources=['_core8.c'],
-                         include_dirs=[get_numpy_include_dirs()])
-    config.add_extension('_core16', sources=['_core16.c'],
-                         include_dirs=[get_numpy_include_dirs()])
-    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())
-          )
diff --git a/skimage/filter/setup.py b/skimage/filter/setup.py
index b996055b..79755e87 100644
--- a/skimage/filter/setup.py
+++ b/skimage/filter/setup.py
@@ -14,11 +14,35 @@ def configuration(parent_package='', top_path=None):
 
     cython(['_ctmf.pyx'], working_path=base_path)
     cython(['_denoise.pyx'], working_path=base_path)
+    cython(['rank/_core8.pyx'], working_path=base_path)
+    cython(['rank/_core16.pyx'], working_path=base_path)
+    cython(['rank/_crank8.pyx'], working_path=base_path)
+    cython(['rank/_crank8_percentiles.pyx'], working_path=base_path)
+    cython(['rank/_crank16.pyx'], working_path=base_path)
+    cython(['rank/_crank16_percentiles.pyx'], working_path=base_path)
+    cython(['rank/_crank16_bilateral.pyx'], working_path=base_path)
 
     config.add_extension('_ctmf', sources=['_ctmf.c'],
-                         include_dirs=[get_numpy_include_dirs()])
+        include_dirs=[get_numpy_include_dirs()])
     config.add_extension('_denoise', sources=['_denoise.c'],
-                         include_dirs=[get_numpy_include_dirs(), '../_shared'])
+        include_dirs=[get_numpy_include_dirs(), '../_shared'])
+    config.add_extension('rank/_core8', sources=['rank/_core8.c'],
+        include_dirs=[get_numpy_include_dirs()])
+    config.add_extension('rank/_core16', sources=['rank/_core16.c'],
+        include_dirs=[get_numpy_include_dirs()])
+    config.add_extension('rank/_crank8', sources=['rank/_crank8.c'],
+        include_dirs=[get_numpy_include_dirs()])
+    config.add_extension(
+        'rank/_crank8_percentiles', sources=['rank/_crank8_percentiles.c'],
+        include_dirs=[get_numpy_include_dirs()])
+    config.add_extension('rank/_crank16', sources=['rank/_crank16.c'],
+        include_dirs=[get_numpy_include_dirs()])
+    config.add_extension(
+        'rank/_crank16_percentiles', sources=['rank/_crank16_percentiles.c'],
+        include_dirs=[get_numpy_include_dirs()])
+    config.add_extension(
+        'rank/_crank16_bilateral', sources=['rank/_crank16_bilateral.c'],
+        include_dirs=[get_numpy_include_dirs()])
 
     return config