From 212c3d15ce2fb6aad44a6c9a6a68f690d4e2d34c Mon Sep 17 00:00:00 2001
From: Evgeni Burovski <evgeny.burovskiy@gmail.com>
Date: Tue, 2 Feb 2016 17:29:56 +0000
Subject: [PATCH] BLD: add the extension to bento.info, fix names

---
 bento.info                                                    | 3 +++
 skimage/morphology/__init__.py                                | 3 ++-
 skimage/morphology/{skel.py => _skeletonize_3d.py}            | 4 ++--
 .../morphology/{_skel.pyx.in => _skeletonize_3d_cy.pyx.in}    | 0
 skimage/morphology/setup.py                                   | 4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename skimage/morphology/{skel.py => _skeletonize_3d.py} (93%)
 rename skimage/morphology/{_skel.pyx.in => _skeletonize_3d_cy.pyx.in} (100%)

diff --git a/bento.info b/bento.info
index 1d7f3a28..5d89ddc9 100644
--- a/bento.info
+++ b/bento.info
@@ -119,6 +119,9 @@ Library:
     Extension: skimage.morphology._skeletonize_cy
         Sources:
             skimage/morphology/_skeletonize_cy.pyx
+    Extension: skimage.morphology._skeletonize_3d_cy
+        Sources:
+            skimage/morphology/_skeletonize_3d_cy.pyx
     Extension: skimage.transform._radon_transform
         Sources:
             skimage/transform/_radon_transform.pyx
diff --git a/skimage/morphology/__init__.py b/skimage/morphology/__init__.py
index 7d294911..4579794f 100644
--- a/skimage/morphology/__init__.py
+++ b/skimage/morphology/__init__.py
@@ -6,7 +6,7 @@ from .selem import (square, rectangle, diamond, disk, cube, octahedron, ball,
                     octagon, star)
 from .watershed import watershed
 from ._skeletonize import skeletonize, medial_axis
-from .skel import compute_thin_image as compute_thin_image
+from ._skeletonize_3d import skeletonize_3d as compute_thin_image
 from .convex_hull import convex_hull_image, convex_hull_object
 from .greyreconstruct import reconstruction
 from .misc import remove_small_objects, remove_small_holes
@@ -35,6 +35,7 @@ __all__ = ['binary_erosion',
            'label',
            'watershed',
            'skeletonize',
+           'skeletonize_3d',
            'medial_axis',
            'convex_hull_image',
            'convex_hull_object',
diff --git a/skimage/morphology/skel.py b/skimage/morphology/_skeletonize_3d.py
similarity index 93%
rename from skimage/morphology/skel.py
rename to skimage/morphology/_skeletonize_3d.py
index 672a1f76..f92590fb 100644
--- a/skimage/morphology/skel.py
+++ b/skimage/morphology/_skeletonize_3d.py
@@ -2,7 +2,7 @@ from __future__ import division, print_function, absolute_import
 
 import numpy as np
 
-from ._skel import _compute_thin_image
+from ._skeletonize_3d_cy import _compute_thin_image
 
 
 def _prepare_image(img_in):
@@ -37,7 +37,7 @@ def _postprocess_image(img_o, intensity):
     return img_oo
 
 
-def compute_thin_image(img_in):
+def skeletonize_3d(img_in):
     """Compute the thin image.
     """
     img, intensity = _prepare_image(img_in)
diff --git a/skimage/morphology/_skel.pyx.in b/skimage/morphology/_skeletonize_3d_cy.pyx.in
similarity index 100%
rename from skimage/morphology/_skel.pyx.in
rename to skimage/morphology/_skeletonize_3d_cy.pyx.in
diff --git a/skimage/morphology/setup.py b/skimage/morphology/setup.py
index 6d572ec6..a1945d91 100644
--- a/skimage/morphology/setup.py
+++ b/skimage/morphology/setup.py
@@ -16,7 +16,7 @@ def configuration(parent_package='', top_path=None):
     cython(['_skeletonize_cy.pyx'], working_path=base_path)
     cython(['_convex_hull.pyx'], working_path=base_path)
     cython(['_greyreconstruct.pyx'], working_path=base_path)
-    cython(['_skel.pyx.in'], working_path=base_path)
+    cython(['_skeletonize_3d_cy.pyx.in'], working_path=base_path)
 
     config.add_extension('_watershed', sources=['_watershed.c'],
                          include_dirs=[get_numpy_include_dirs()])
@@ -26,7 +26,7 @@ def configuration(parent_package='', top_path=None):
                          include_dirs=[get_numpy_include_dirs()])
     config.add_extension('_greyreconstruct', sources=['_greyreconstruct.c'],
                          include_dirs=[get_numpy_include_dirs()])
-    config.add_extension('_skel', sources=['_skel.c'],
+    config.add_extension('_skeletonize_3d_cy', sources=['_skeletonize_3d_cy.c'],
                          include_dirs=[get_numpy_include_dirs()])
 
     return config