From f9a7534c35e092b495798af6005f496e50994040 Mon Sep 17 00:00:00 2001
From: Remi Cresson <remi.cresson@inrae.fr>
Date: Mon, 10 Jul 2023 18:01:26 +0200
Subject: [PATCH 1/4] ADD: update required packages + bump version
---
setup.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/setup.py b/setup.py
index ccf2757..411140b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,19 @@
from setuptools import setup, find_packages
install_requires = [
- "requests", "qrcode", "appdirs", "pydantic", "pystac", "pystac_client"
+ "requests",
+ "qrcode",
+ "appdirs",
+ "pydantic",
+ "pystac",
+ "pystac_client",
+ "pydantic>=1.7.3",
+ "packaging"
]
setup(
name="dinamis-sdk",
- version="0.0.12",
+ version="0.0.14",
description="DINAMIS SDK",
python_requires=">=3.8",
author="Remi Cresson",
--
GitLab
From d47d9b98af63fbfd48672b65735ecae5fba248ed Mon Sep 17 00:00:00 2001
From: Remi Cresson <remi.cresson@inrae.fr>
Date: Mon, 10 Jul 2023 18:01:44 +0200
Subject: [PATCH 2/4] ADD: compatibility with pydantic v2
---
dinamis_sdk/s3.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/dinamis_sdk/s3.py b/dinamis_sdk/s3.py
index 5cb693c..ea7318a 100644
--- a/dinamis_sdk/s3.py
+++ b/dinamis_sdk/s3.py
@@ -23,10 +23,15 @@ from pystac.serialization.identify import identify_stac_object_type
from pystac.utils import datetime_to_str
import pystac_client
from pystac_client import ItemSearch
+import packaging.version
+import pydantic
from .utils import log, SIGNED_URL_TTL_MARGIN, CREDENTIALS, MAX_URLS, \
S3_SIGNING_ENDPOINT, S3_STORAGE_DOMAIN
+_PYDANTIC_2_0 = packaging.version.parse(
+ pydantic.__version__
+) >= packaging.version.parse("2.0.0")
AssetLike = TypeVar("AssetLike", Asset, Dict[str, Any])
@@ -46,8 +51,11 @@ class URLBase(BaseModel): # pylint: disable = R0903
class Config: # pylint: disable = R0903
"""Config for URLBase model."""
- json_encoders = {datetime: datetime_to_str}
- allow_population_by_field_name = True
+ if _PYDANTIC_2_0:
+ populate_by_name = True
+ else:
+ allow_population_by_field_name = True
+ json_encoders = {datetime: datetime_to_str}
class SignedURL(URLBase): # pylint: disable = R0903
--
GitLab
From 9ed655eac5a1113e6a6bcb666c5e5bd722f17a04 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Wed, 4 Oct 2023 16:15:35 +0200
Subject: [PATCH 3/4] Update dinamis_sdk/utils.py
---
dinamis_sdk/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dinamis_sdk/utils.py b/dinamis_sdk/utils.py
index eb75971..bb25a90 100644
--- a/dinamis_sdk/utils.py
+++ b/dinamis_sdk/utils.py
@@ -23,7 +23,7 @@ SIGNED_URL_TTL_MARGIN = ttl_margin_from_env or 1800
MAX_URLS = 64
S3_STORAGE_DOMAIN = "minio-api-dinamis.apps.okd.crocc.meso.umontpellier.fr"
S3_SIGNING_ENDPOINT = \
- "https://s3-signing-dinamis.apps.okd.crocc.meso.umontpellier.fr/"
+ "https://s3-signing-cdos.apps.okd.crocc.meso.umontpellier.fr/"
CFG_PTH = appdirs.user_config_dir(appname='dinamis_sdk_auth')
if not os.path.exists(CFG_PTH):
--
GitLab
From de9086371788aa51ad4e8a53e6a3cfc9d39d51ee Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Wed, 4 Oct 2023 16:40:03 +0200
Subject: [PATCH 4/4] Update dinamis_sdk/utils.py
---
dinamis_sdk/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dinamis_sdk/utils.py b/dinamis_sdk/utils.py
index bb25a90..eb75971 100644
--- a/dinamis_sdk/utils.py
+++ b/dinamis_sdk/utils.py
@@ -23,7 +23,7 @@ SIGNED_URL_TTL_MARGIN = ttl_margin_from_env or 1800
MAX_URLS = 64
S3_STORAGE_DOMAIN = "minio-api-dinamis.apps.okd.crocc.meso.umontpellier.fr"
S3_SIGNING_ENDPOINT = \
- "https://s3-signing-cdos.apps.okd.crocc.meso.umontpellier.fr/"
+ "https://s3-signing-dinamis.apps.okd.crocc.meso.umontpellier.fr/"
CFG_PTH = appdirs.user_config_dir(appname='dinamis_sdk_auth')
if not os.path.exists(CFG_PTH):
--
GitLab