From 317d6c7987dcba1fe5cfdeb22557914b9fe9f187 Mon Sep 17 00:00:00 2001
From: Stefaan Lippens <stefaan.lippens@vito.be>
Date: Wed, 12 Feb 2025 10:12:31 +0100
Subject: [PATCH] Issue #170 update to now released openeo v0.38.0

---
 setup.py                                          | 2 +-
 src/openeo_aggregator/backend.py                  | 4 +---
 src/openeo_aggregator/connection.py               | 4 +---
 src/openeo_aggregator/partitionedjobs/tracking.py | 4 +---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/setup.py b/setup.py
index 218fc0b..12e5b4c 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@
     install_requires=[
         "requests",
         "attrs",
-        "openeo>=0.36.0,<0.38.0",  # TODO #170 temporary pin waiting for actual 0.38.0 release
+        "openeo>=0.38.0",
         "openeo_driver>=0.123.0.dev",
         "flask~=2.0",
         "gunicorn~=20.0",
diff --git a/src/openeo_aggregator/backend.py b/src/openeo_aggregator/backend.py
index 3954d78..0c27b1c 100644
--- a/src/openeo_aggregator/backend.py
+++ b/src/openeo_aggregator/backend.py
@@ -31,9 +31,6 @@
 import openeo_driver.errors
 import openeo_driver.util.changelog
 import openeo_driver.util.view_helpers
-
-# TODO #170: from openeo.utils.version import ComparableVersion
-from openeo.capabilities import ComparableVersion
 from openeo.rest import (
     OpenEoApiError,
     OpenEoApiPlainError,
@@ -41,6 +38,7 @@
     OpenEoRestError,
 )
 from openeo.util import TimingLogger, deep_get, dict_no_none
+from openeo.utils.version import ComparableVersion
 from openeo_driver.backend import (
     AbstractCollectionCatalog,
     BatchJobMetadata,
diff --git a/src/openeo_aggregator/connection.py b/src/openeo_aggregator/connection.py
index 08d9926..24687a4 100644
--- a/src/openeo_aggregator/connection.py
+++ b/src/openeo_aggregator/connection.py
@@ -20,12 +20,10 @@
 import flask
 import requests
 from openeo import Connection
-
-# TODO #170: from openeo.utils.version import ComparableVersion
-from openeo.capabilities import ComparableVersion
 from openeo.rest.auth.auth import BearerAuth, OpenEoApiAuthBase
 from openeo.rest.connection import RestApiConnection
 from openeo.util import TimingLogger
+from openeo.utils.version import ComparableVersion
 from openeo_driver.backend import OidcProvider
 from openeo_driver.errors import (
     AuthenticationRequiredException,
diff --git a/src/openeo_aggregator/partitionedjobs/tracking.py b/src/openeo_aggregator/partitionedjobs/tracking.py
index 57e88e3..c11f4bf 100644
--- a/src/openeo_aggregator/partitionedjobs/tracking.py
+++ b/src/openeo_aggregator/partitionedjobs/tracking.py
@@ -5,10 +5,8 @@
 from typing import Dict, List, Optional
 
 import flask
-
-# TODO #170 from openeo.rest.models.logs import LogEntry
-from openeo.api.logs import LogEntry
 from openeo.rest.job import BatchJob, ResultAsset
+from openeo.rest.models.logs import LogEntry
 from openeo.util import TimingLogger
 from openeo_driver.errors import JobNotFinishedException
 from openeo_driver.users import User