Merge pull request #509 from sentinel-hub/develop

Release version 1.3.1

Author: zigaLuksic

CHANGELOG.md

@@ -1,3 +1,13 @@
+## [Version 1.3.1] - 2022-11-23
+
+- Sentinel Hub IO tasks now support a custom timestamp filtration via `timestamp_filter` parameter.
+- `MergeFeatureTask` now supports the `axis` parameter.
+- Fix minor issues with the coregistration module.
+- Prepare for future removal of `sentinelhub.os_utils`.
+- Fix type annotations after `mypy` update.
+- Improvements to tests and various minor changes.
+
+
 ## [Version 1.3.0] - 2022-10-06
 
 - (**codebreaking**) Adapted Sentinel Hub tasks to `sentinelhub-py 3.8.0` which switched to Catalog 1.0.0.

core/eolearn/core/__init__.py

@@ -32,4 +32,4 @@
 from .utils.parallelize import execute_with_mp_lock, join_futures, join_futures_iter, parallelize
 from .utils.parsing import FeatureParser
 
-__version__ = "1.3.0"
+__version__ = "1.3.1"

core/eolearn/core/core_tasks.py

@@ -508,11 +508,11 @@ def zip_method(self, *f):
 
 
 class MergeFeatureTask(ZipFeatureTask):
-    """Merges multiple features together by concatenating their data along the last axis."""
+    """Merges multiple features together by concatenating their data along the specified axis."""
 
-    def zip_method(self, *f: np.ndarray, dtype: Union[None, np.dtype, type] = None) -> np.ndarray:
-        """Concatenates the data of features along the last axis."""
-        return np.concatenate(f, axis=-1, dtype=dtype)  # pylint: disable=unexpected-keyword-arg
+    def zip_method(self, *f: np.ndarray, dtype: Union[None, np.dtype, type] = None, axis: int = -1) -> np.ndarray:
+        """Concatenates the data of features along the specified axis."""
+        return np.concatenate(f, axis=axis, dtype=dtype)  # pylint: disable=unexpected-keyword-arg
 
 
 class ExtractBandsTask(MapFeatureTask):

core/eolearn/core/eodata.py

@@ -175,7 +175,7 @@ class _FeatureDictGeoDf(_FeatureDict[gpd.GeoDataFrame]):
     """_FeatureDict object specialized for GeoDataFrames."""
 
     def __init__(self, feature_dict: Dict[str, gpd.GeoDataFrame], feature_type: FeatureType):
-        if not feature_type.is_vector:
+        if not feature_type.is_vector():
             raise ValueError(f"Feature type {feature_type} does not represent a vector feature.")
         super().__init__(feature_dict, feature_type)
 

core/eolearn/core/eodata_io.py

@@ -16,6 +16,7 @@
 import datetime
 import gzip
 import json
+import platform
 import warnings
 from abc import ABCMeta, abstractmethod
 from collections import defaultdict
@@ -50,7 +51,6 @@
 
 from sentinelhub import CRS, BBox, Geometry, MimeType
 from sentinelhub.exceptions import SHUserWarning
-from sentinelhub.os_utils import sys_is_windows
 
 from .constants import FeatureType, FeatureTypeSet, OverwritePermission
 from .utils.parsing import FeatureParser, FeaturesSpecification
@@ -85,7 +85,7 @@ def save_eopatch(
         _check_letter_case_collisions(eopatch_features, fs_features)
         _check_add_only_permission(eopatch_features, fs_features)
 
-    elif sys_is_windows() and overwrite_permission is OverwritePermission.OVERWRITE_FEATURES:
+    elif platform.system() == "Windows" and overwrite_permission is OverwritePermission.OVERWRITE_FEATURES:
         _check_letter_case_collisions(eopatch_features, fs_features)
 
     else:

core/eolearn/tests/test_core_tasks.py

@@ -308,7 +308,8 @@ def test_move_feature():
     assert "MTless2" in patch_dst[FeatureType.MASK_TIMELESS]
 
 
-def test_merge_features():
+@pytest.mark.parametrize("axis", (0, -1))
+def test_merge_features(axis):
     patch = EOPatch()
 
     shape = (10, 5, 5, 3)
@@ -332,10 +333,10 @@ def test_merge_features():
     for feat, dat in zip(features, data):
         patch = AddFeatureTask(feat)(patch, dat)
 
-    patch = MergeFeatureTask(features[:3], (FeatureType.MASK, "merged"))(patch)
-    patch = MergeFeatureTask(features[3:], (FeatureType.MASK_TIMELESS, "merged_timeless"))(patch)
+    patch = MergeFeatureTask(features[:3], (FeatureType.MASK, "merged"), axis=axis)(patch)
+    patch = MergeFeatureTask(features[3:], (FeatureType.MASK_TIMELESS, "merged_timeless"), axis=axis)(patch)
 
-    expected = np.concatenate([patch[f] for f in features[:3]], axis=-1)
+    expected = np.concatenate([patch[f] for f in features[:3]], axis=axis)
 
     assert np.array_equal(patch.mask["merged"], expected)
 

core/eolearn/tests/test_utils/test_parsing.py

@@ -170,7 +170,7 @@ def test_allowed_feature_types(test_input: FeaturesSpecification, allowed_types:
         FeatureParser(features=test_input, allowed_feature_types=allowed_types)
 
 
-@pytest.fixture(name="eopatch", scope="session")
+@pytest.fixture(name="eopatch", scope="module")
 def eopatch_fixture():
     return EOPatch(
         data=dict(data=np.zeros((2, 2, 2, 2)), CLP=np.zeros((2, 2, 2, 2))),  # name duplication intentional

coregistration/eolearn/coregistration/__init__.py

@@ -4,4 +4,4 @@
 
 from .coregistration import ECCRegistrationTask, InterpolationType, PointBasedRegistrationTask, RegistrationTask
 
-__version__ = "1.3.0"
+__version__ = "1.3.1"

coregistration/eolearn/coregistration/coregistration.py

@@ -331,7 +331,7 @@ def register(self, src, trg, trg_mask=None, src_mask=None):
         # Initialise matrix and failed registrations flag
         warp_matrix = None
         # Initiate point detector
-        ptdt = cv2.xfeatures2d.SIFT_create() if self.params["Descriptor"] == "SIFT" else cv2.xfeatures2d.SURF_create()
+        ptdt = cv2.SIFT_create() if self.params["Descriptor"] == "SIFT" else cv2.SURF_create()
         # create BFMatcher object
         bf_matcher = cv2.BFMatcher(cv2.NORM_L1, crossCheck=True)
         # find the key points and descriptors with SIFT

features/eolearn/features/__init__.py

@@ -38,4 +38,4 @@
     AddSpatioTemporalFeaturesTask,
 )
 
-__version__ = "1.3.0"
+__version__ = "1.3.1"