Skip to content

Commit

Permalink
Simplify Cythonization in morphology.setup.py
Browse files Browse the repository at this point in the history
_extrema_cy.pyx was cythonized twice for now reason.
  • Loading branch information
lagru committed Sep 26, 2019
1 parent b2bb144 commit a1a8de2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions skimage/morphology/setup.py
Expand Up @@ -16,13 +16,12 @@ def configuration(parent_package='', top_path=None):
'_skeletonize_cy.pyx',
'_convex_hull.pyx',
'_greyreconstruct.pyx',
'_extrema_cy.pyx'], working_path=base_path)
'_extrema_cy.pyx',
'_close_objects_cy.pyx'], working_path=base_path)
# _skeletonize_3d uses c++, so it must be cythonized separately
cython(['_skeletonize_3d_cy.pyx.in'], working_path=base_path)
cython(['_extrema_cy.pyx'], working_path=base_path)
cython(['_flood_fill_cy.pyx'], working_path=base_path)
cython(['_max_tree.pyx'], working_path=base_path)
cython(['_close_objects_cy.pyx'], working_path=base_path)

config.add_extension('_watershed', sources=['_watershed.c'],
include_dirs=[get_numpy_include_dirs()])
Expand Down
2 changes: 1 addition & 1 deletion skimage/morphology/tests/test_misc.py
Expand Up @@ -195,7 +195,7 @@ def test_float_input_holes():
remove_small_holes(float_test)


class Test_remove_close_objects:
class TestRemoveCloseObjects:

@pytest.mark.parametrize("minimal_distance", [10, 20, 30, 49])
def test_linspace_1d(self, minimal_distance):
Expand Down

0 comments on commit a1a8de2

Please sign in to comment.