deactivate obsolete test; fix eostac cat_baseurl functionality

Author: ungarj

mapchete_eo/base.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import warnings
 import logging
 from functools import cached_property
 from typing import Any, Callable, List, Optional, Sequence, Type, Union, Dict, Generator
@@ -62,6 +63,22 @@ def to_list(cls, values: Dict[str, Any]) -> Dict[str, Any]:
                 values[field] = [value]
         return values
 
+    @model_validator(mode="before")
+    def deprecate_cat_baseurl(cls, values: Dict[str, Any]) -> Dict[str, Any]:
+        cat_baseurl = values.get("cat_baseurl")
+        if cat_baseurl:
+            warnings.warn(
+                "'cat_baseurl' will be deprecated soon. Please use 'catalog_type=static' in the source.",
+                category=DeprecationWarning,
+                stacklevel=2,
+            )
+            if values.get("source", []):
+                raise ValueError(
+                    "deprecated cat_baseurl field found alongside sources."
+                )
+            values["source"] = [dict(stac_catalog=cat_baseurl, catalog_type="static")]
+        return values
+
 
 class EODataCube(base.InputTile):
     """Target Tile representation of input data."""

mapchete_eo/platforms/sentinel2/config.py

@@ -170,22 +170,6 @@ def deprecate_cloud_cover(cls, values: Dict[str, Any]) -> Dict[str, Any]:
             values["source"] = updated_sources
         return values
 
-    @model_validator(mode="before")
-    def deprecate_cat_baseurl(cls, values: Dict[str, Any]) -> Dict[str, Any]:
-        cat_baseurl = values.get("cat_baseurl")
-        if cat_baseurl:
-            warnings.warn(
-                "'cat_baseurl' will be deprecated soon. Please use 'catalog_type=static' in the source.",
-                category=DeprecationWarning,
-                stacklevel=2,
-            )
-            if values.get("source", []):
-                raise ValueError(
-                    "deprecated cat_baseurl field found alongside sources."
-                )
-            values["source"] = [dict(stac_catalog=cat_baseurl, catalog_type="static")]
-        return values
-
 
 class MaskConfig(BaseModel):
     # mask by footprint geometry

tests/test_s2_mgrs.py

@@ -128,6 +128,7 @@ def test_s2tile_antimeridian_footprint(tile_id, control_geom_type):
         assert Bounds.from_inp(s2tile.latlon_geometry).width < 10
 
 
+@pytest.mark.skip(reason="deprecated functionality")
 def test_sentinel2_jp2_static_catalog(sentinel2_jp2_static_catalog_mapchete):
     inp = sentinel2_jp2_static_catalog_mapchete.mp().config.at_zoom(13)["input"]["inp"]
     assert inp.archive.get_catalog_config().search_index