Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"requests-mock",
"pylint>=2.5.0",
"astroid>=2.4.0",
"openeo_udf>=1.0.0rc3",
# openeo_udf (unmaintained) is packaging-wise not compatible with Python 3.12 and up https://github.com/Open-EO/openeo-python-driver/issues/558
"openeo_udf>=1.0.0rc3; python_version < '3.12'",
"boto3[s3]>=1.26.17",
"moto[s3]>=5.0.0",
"time-machine>=2.8.0",
Expand Down
27 changes: 22 additions & 5 deletions tests/test_views_execute.py
Original file line number Diff line number Diff line change
Expand Up @@ -1655,17 +1655,26 @@ def test_run_udf_on_vector_load_uploaded_files(api, udf_code):
assert (resp.json == expected_featurecollection)


SKIP_DEPRECATED_OPENEO_UDF_ON_PYTHON312_AND_UP = pytest.mark.skipif(
condition=sys.version_info >= (3, 12),
reason="Package `openeo_udf` is not compatible with Python 3.12 and up",
)


@pytest.mark.parametrize(
"udf_code",
[
"""
pytest.param(
"""
from openeo_udf.api.datacube import DataCube # Old style openeo_udf API
def fct_buffer(udf_data: UdfData):
gdf = udf_data.feature_collection_list[0].data
gdf = gdf.buffer(1)
udf_data.feature_collection_list = [FeatureCollection(id="", data=gdf)]
return udf_data
""",
marks=SKIP_DEPRECATED_OPENEO_UDF_ON_PYTHON312_AND_UP,
),
"""
from openeo.udf import UdfData, FeatureCollection
def fct_buffer(udf_data: UdfData):
Expand Down Expand Up @@ -1701,7 +1710,8 @@ def test_run_udf_on_vector_inline_geojson(api, udf_code):
@pytest.mark.parametrize(
"udf_code",
[
"""
pytest.param(
"""
from openeo_udf.api.udf_data import UdfData # Old style openeo_udf API
from openeo_udf.api.structured_data import StructuredData # Old style openeo_udf API
def fct_buffer(udf_data: UdfData):
Expand All @@ -1711,6 +1721,8 @@ def fct_buffer(udf_data: UdfData):
for s in data
])
""",
marks=SKIP_DEPRECATED_OPENEO_UDF_ON_PYTHON312_AND_UP,
),
"""
from openeo.udf import UdfData, StructuredData
def fct_buffer(udf_data: UdfData):
Expand All @@ -1735,8 +1747,11 @@ def test_run_udf_on_json(api, udf_code):
}


@pytest.mark.parametrize("udf_code", [
"""
@pytest.mark.parametrize(
"udf_code",
[
pytest.param(
"""
from openeo_udf.api.udf_data import UdfData # Old style openeo_udf API
from openeo_udf.api.structured_data import StructuredData # Old style openeo_udf API
def transform(data: UdfData) -> UdfData:
Expand All @@ -1746,7 +1761,9 @@ def transform(data: UdfData) -> UdfData:
]
data.set_structured_data_list(res)
""",
"""
marks=SKIP_DEPRECATED_OPENEO_UDF_ON_PYTHON312_AND_UP,
),
"""
from openeo.udf import UdfData, StructuredData
def transform(data: UdfData) -> UdfData:
res = [
Expand Down
Loading