process mask extras

sentinel-hub · Aug 31, 2023 · ce0767d · ce0767d
1 parent e9f1acc
commit ce0767d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 10 deletions.
diff --git a/eolearn/mask/__init__.py b/eolearn/mask/__init__.py
@@ -2,7 +2,6 @@
 Public classes and functions of mask subpackage
 """
 
-from .cloud_mask import CloudMaskTask
 from .mask_counting import ClassFrequencyTask
 from .masking import JoinMasksTask, MaskFeatureTask
 from .snow_mask import SnowMaskTask, TheiaSnowMaskTask

diff --git a/eolearn/mask/extra/__init__.py b/eolearn/mask/extra/__init__.py
@@ -0,0 +1,4 @@
+"""
+A collection of EOTasks with non-standard dependencies. Use the extra `MASK_EXTRA` to install dependencies or
+install the module-specific dependencies by hand.
+"""
diff --git a/eolearn/mask/cloud_mask.py → eolearn/mask/extra/cloud_mask.py b/eolearn/mask/cloud_mask.py → eolearn/mask/extra/cloud_mask.py
@@ -25,7 +25,7 @@
 from eolearn.core.types import Feature
 from eolearn.core.utils.common import _apply_to_spatial_axes
 
-from .utils import resize_images
+from ..utils import resize_images
 
 LOGGER = logging.getLogger(__name__)
 

diff --git a/...pixel_s2_cloud_detector_lightGBM_v0.2.txt → ...pixel_s2_cloud_detector_lightGBM_v0.2.txt b/...pixel_s2_cloud_detector_lightGBM_v0.2.txt → ...pixel_s2_cloud_detector_lightGBM_v0.2.txt
diff --git a/.../ssim_s2_cloud_detector_lightGBM_v0.2.txt → .../ssim_s2_cloud_detector_lightGBM_v0.2.txt b/.../ssim_s2_cloud_detector_lightGBM_v0.2.txt → .../ssim_s2_cloud_detector_lightGBM_v0.2.txt
diff --git a/pyproject.toml b/pyproject.toml
@@ -79,12 +79,8 @@ geodb = [
     "xcube-geodb @ git+git://github.com/dcs4cop/xcube-geodb.git",
 ]
 meteoblue = ["meteoblue_dataset_sdk>=1,<2"]
-mask = [
-    "lightgbm>=2.0.11, <4",
-    "opencv-python-headless",
-    "s2cloudless",
-    "scikit-image>=0.13.0",
-]
+mask = ["opencv-python-headless"]
+mask_extra = ["lightgbm>=2.0.11, <4", "s2cloudless", "scikit-image>=0.13.0"]
 mltools = ["shapely"]
 tdigest = ["tdigest==0.5.2.2"]
 mltoolsplotting = ["matplotlib"]

diff --git a/tests/mask/test_cloud_mask.py → tests/mask/extra/test_cloud_mask.py b/tests/mask/test_cloud_mask.py → tests/mask/extra/test_cloud_mask.py
@@ -11,8 +11,7 @@
 from numpy.testing import assert_array_equal
 
 from eolearn.core import FeatureType
-from eolearn.mask import CloudMaskTask
-from eolearn.mask.cloud_mask import _get_window_indices, _OldCloudMaskTask
+from eolearn.mask.extra.cloud_mask import CloudMaskTask, _get_window_indices, _OldCloudMaskTask
 
 
 @pytest.mark.parametrize(