Merge branch 'master' into issue525-onnx-process

Author: ElienVandermaesenVITO

openeo/metadata.py

@@ -2,7 +2,6 @@
 
 import functools
 import logging
-import warnings
 from typing import (
     Any,
     Callable,
@@ -540,7 +539,7 @@ def __init__(self, metadata: dict, dimensions: List[Dimension] = None, _federati
         self._federation = _federation
 
     @classmethod
-    def _parse_dimensions(cls, spec: dict, complain: Callable[[str], None] = warnings.warn) -> List[Dimension]:
+    def _parse_dimensions(cls, spec: dict, complain: Callable[[str], None] = _log.warning) -> List[Dimension]:
         """
         Extract data cube dimension metadata from STAC-like description of a collection.
 

setup.py

@@ -27,7 +27,7 @@
     "geopandas>=0.14; python_version>='3.9'",
     "geopandas",  # Best-effort geopandas dependency for Python 3.8
     "flake8>=5.0.0",
-    "time_machine",
+    "time_machine>=2.13.0",
     "pyproj>=3.2.0",  # Pyproj is an optional, best-effort runtime dependency
     "dirty_equals>=0.8.0",
     "pyarrow>=10.0.1",  # For Parquet read/write support in pandas

tests/rest/conftest.py

@@ -1,5 +1,6 @@
 import contextlib
 import re
+import time
 import typing
 from unittest import mock
 
@@ -25,9 +26,7 @@ def __init__(self):
     @contextlib.contextmanager
     def patch(self, time_machine: time_machine.TimeMachineFixture) -> typing.Iterator["_Sleeper"]:
         def sleep(seconds):
-            # Note: this requires that `time_machine.move_to()` has been called before
-            # also see https://github.com/adamchainz/time-machine/issues/247
-            time_machine.coordinates.shift(seconds)
+            time_machine.shift(seconds)
             self.history.append(seconds)
 
         with mock.patch("time.sleep", new=sleep):
@@ -58,15 +57,15 @@ def oidc_device_code_flow_checker(time_machine, simple_time, fast_sleep, capsys)
 
     @contextlib.contextmanager
     def assert_oidc_device_code_flow(url: str = "https://oidc.test/dc", elapsed: float = 3, check_capsys: bool = True):
-        start = time_machine.coordinates.time()
+        start = time.time()
         yield
         assert fast_sleep.did_sleep()
         if check_capsys:
             stdout, _ = capsys.readouterr()
             assert f"Visit {url} and enter" in stdout
             assert re.search(r"\[#+-*\] Authorization pending *\r\[#+-*\] Polling *\r", stdout)
             assert re.search(r"Authorized successfully *\r\n", stdout)
-        assert time_machine.coordinates.time() - start >= elapsed
+        assert time.time() - start >= elapsed
 
     return assert_oidc_device_code_flow