From d9186c90a1bcc9adf90de8567cb473e4382bc838 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 11 Dec 2011 17:04:46 -0500 Subject: [PATCH] Remove thresholding subpackage and integrate into filter subpackage. --- skimage/filter/__init__.py | 1 + skimage/{thresholding => filter}/tests/test_thresholding.py | 2 +- skimage/{thresholding => filter}/thresholding.py | 0 skimage/thresholding/__init__.py | 2 -- 4 files changed, 2 insertions(+), 3 deletions(-) rename skimage/{thresholding => filter}/tests/test_thresholding.py (95%) rename skimage/{thresholding => filter}/thresholding.py (100%) delete mode 100644 skimage/thresholding/__init__.py diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py index d3baf934..1acc33f2 100644 --- a/skimage/filter/__init__.py +++ b/skimage/filter/__init__.py @@ -4,3 +4,4 @@ from canny import canny from edges import sobel, hsobel, vsobel, hprewitt, vprewitt, prewitt from tv_denoise import tv_denoise from rank_order import rank_order +from thresholding import threshold_otsu diff --git a/skimage/thresholding/tests/test_thresholding.py b/skimage/filter/tests/test_thresholding.py similarity index 95% rename from skimage/thresholding/tests/test_thresholding.py rename to skimage/filter/tests/test_thresholding.py index 2ec64da6..b0044a47 100644 --- a/skimage/thresholding/tests/test_thresholding.py +++ b/skimage/filter/tests/test_thresholding.py @@ -2,7 +2,7 @@ import numpy as np import skimage from skimage import data -from skimage.thresholding import threshold_otsu +from skimage.filter.thresholding import threshold_otsu class TestSimpleImage(): diff --git a/skimage/thresholding/thresholding.py b/skimage/filter/thresholding.py similarity index 100% rename from skimage/thresholding/thresholding.py rename to skimage/filter/thresholding.py diff --git a/skimage/thresholding/__init__.py b/skimage/thresholding/__init__.py deleted file mode 100644 index 9b6e229c..00000000 --- a/skimage/thresholding/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -from .thresholding import threshold_otsu -