Merge branch 'main' into 57-udf-memory-profiling

WorldCereal · Jun 24, 2024 · 64c4eee · 64c4eee
2 parents 84f12bc + 4680b7e
commit 64c4eee
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 60 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -41,6 +41,7 @@ dependencies = [
     "numpy<2.0.0",
     "h5netcdf>=1.1.0",
     "openeo>=0.29.0",
+    "openeo-gfmap==0.1.0",
     "cftime",
     "pytest-depends",
     "pyarrow",

diff --git a/src/worldcereal/__init__.py b/src/worldcereal/__init__.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
 
 from ._version import __version__
-from .utils.spatial import BoundingBoxExtent
 
-__all__ = ["__version__", "BoundingBoxExtent"]
+__all__ = ["__version__"]
 
 SUPPORTED_SEASONS = [
     "tc-s1",

diff --git a/src/worldcereal/seasons.py b/src/worldcereal/seasons.py
@@ -5,8 +5,9 @@
 import numpy as np
 import pandas as pd
 from loguru import logger
+from openeo_gfmap import BoundingBoxExtent
 
-from worldcereal import SEASONAL_MAPPING, SUPPORTED_SEASONS, BoundingBoxExtent
+from worldcereal import SEASONAL_MAPPING, SUPPORTED_SEASONS
 from worldcereal.data import cropcalendars
 
 # from worldcereal.utils import aez as aezloader

diff --git a/src/worldcereal/utils/spatial.py b/src/worldcereal/utils/spatial.py
diff --git a/tests/worldcerealtests/test_seasons.py b/tests/worldcerealtests/test_seasons.py
@@ -2,8 +2,8 @@
 
 import numpy as np
 import pandas as pd
+from openeo_gfmap import BoundingBoxExtent
 
-from worldcereal import BoundingBoxExtent
 from worldcereal.seasons import (
     circular_median_day_of_year,
     doy_from_tiff,