From 42a7c3b72af6b1a99c58bd70bb57c54258ff5bc8 Mon Sep 17 00:00:00 2001 From: Gregory Lee Date: Mon, 19 Jun 2023 13:43:17 -0400 Subject: [PATCH] apply isort --- python/cucim/setup.py | 2 +- python/cucim/src/cucim/skimage/__init__.py | 14 ++----- python/cucim/src/cucim/skimage/__init__.pyi | 18 ++------ .../src/cucim/skimage/filters/__init__.pyi | 42 ++++--------------- 4 files changed, 15 insertions(+), 61 deletions(-) diff --git a/python/cucim/setup.py b/python/cucim/setup.py index f7a165ee4..41cef8ecf 100755 --- a/python/cucim/setup.py +++ b/python/cucim/setup.py @@ -87,7 +87,7 @@ def read(*names, **kwargs): setup_requires=SETUP_REQUIRES, install_requires=[ # TODO: Check cupy dependency based on cuda version - 'click', 'numpy', "lazy_loader>=0.1", # 'scipy', 'scikit-image' + 'click', 'numpy', "lazy_loader>=0.1", # 'scipy', 'scikit-image' # eg: 'aspectlib==1.1.1', 'six>=1.7', ], extras_require={ diff --git a/python/cucim/src/cucim/skimage/__init__.py b/python/cucim/src/cucim/skimage/__init__.py index 490e8896f..c6cf7d4eb 100644 --- a/python/cucim/src/cucim/skimage/__init__.py +++ b/python/cucim/src/cucim/skimage/__init__.py @@ -70,15 +70,7 @@ def __dir__(): # Legacy imports into the root namespace; not advertised in __all__ -from .util.dtype import ( - dtype_limits, - img_as_float32, - img_as_float64, - img_as_float, - img_as_int, - img_as_uint, - img_as_ubyte, - img_as_bool -) - +from .util.dtype import (dtype_limits, img_as_bool, img_as_float, + img_as_float32, img_as_float64, img_as_int, + img_as_ubyte, img_as_uint) from .util.lookfor import lookfor diff --git a/python/cucim/src/cucim/skimage/__init__.pyi b/python/cucim/src/cucim/skimage/__init__.pyi index adc4cb9ed..1c3c07ea6 100644 --- a/python/cucim/src/cucim/skimage/__init__.pyi +++ b/python/cucim/src/cucim/skimage/__init__.pyi @@ -18,18 +18,6 @@ submodules = [ __all__ = submodules -from . import ( - color, - data, - exposure, - feature, - filters, - measure, - metrics, - morphology, - registration, - restoration, - segmentation, - transform, - util, -) +from . import (color, data, exposure, feature, filters, measure, metrics, + morphology, registration, restoration, segmentation, transform, + util) diff --git a/python/cucim/src/cucim/skimage/filters/__init__.pyi b/python/cucim/src/cucim/skimage/filters/__init__.pyi index de97c398e..758f11dcd 100644 --- a/python/cucim/src/cucim/skimage/filters/__init__.pyi +++ b/python/cucim/src/cucim/skimage/filters/__init__.pyi @@ -56,39 +56,13 @@ from ._rank_order import rank_order from ._sparse import correlate_sparse from ._unsharp_mask import unsharp_mask from ._window import window -from ._rank_order import rank_order -from .edges import ( - farid, - farid_h, - farid_v, - laplace, - prewitt, - prewitt_h, - prewitt_v, - roberts, - roberts_neg_diag, - roberts_pos_diag, - scharr, - scharr_h, - scharr_v, - sobel, - sobel_h, - sobel_v, -) +from .edges import (farid, farid_h, farid_v, laplace, prewitt, prewitt_h, + prewitt_v, roberts, roberts_neg_diag, roberts_pos_diag, + scharr, scharr_h, scharr_v, sobel, sobel_h, sobel_v) from .lpi_filter import LPIFilter2D, filter_inverse, inverse, wiener from .ridges import frangi, hessian, meijering, sato -from .thresholding import ( - apply_hysteresis_threshold, - threshold_isodata, - threshold_li, - threshold_local, - threshold_mean, - threshold_minimum, - threshold_multiotsu, - threshold_niblack, - threshold_otsu, - threshold_sauvola, - threshold_triangle, - threshold_yen, - try_all_threshold, -) +from .thresholding import (apply_hysteresis_threshold, threshold_isodata, + threshold_li, threshold_local, threshold_mean, + threshold_minimum, threshold_multiotsu, + threshold_niblack, threshold_otsu, threshold_sauvola, + threshold_triangle, threshold_yen, try_all_threshold)