From 9b809f5bc22fbff31813595385cd6d03c280f169 Mon Sep 17 00:00:00 2001 From: Cresson Remi <remi.cresson@irstea.fr> Date: Tue, 20 Feb 2024 17:34:54 +0100 Subject: [PATCH 1/3] Update 2 files - /dinamis_sdk/utils.py - /setup.py --- dinamis_sdk/utils.py | 20 ++++++++++---------- setup.py | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dinamis_sdk/utils.py b/dinamis_sdk/utils.py index 20c6b12..fa9735f 100644 --- a/dinamis_sdk/utils.py +++ b/dinamis_sdk/utils.py @@ -17,18 +17,18 @@ def _get_seconds(env_var_name: str) -> int: return None # Signed TTL margin default to 1800 seconds (30 minutes), or env. var. -ttl_margin_from_env = _get_seconds("DINAMIS_SDK_TTL_MARGIN") -log.info( - "Setting TTL margin from environment variable to %s seconds", - ttl_margin_from_env -) +if (ttl_margin_from_env := _get_seconds("DINAMIS_SDK_TTL_MARGIN")): + log.info( + "Setting TTL margin from environment variable to %s seconds", + ttl_margin_from_env + ) SIGNED_URL_TTL_MARGIN = ttl_margin_from_env or 1800 -SIGNED_URL_DURATION_SECONDS = _get_seconds("DINAMIS_SDK_DURATION_SECONDS") -log.info( - "Setting duration seconds from environment variable to %s seconds", - SIGNED_URL_DURATION_SECONDS -) +if (SIGNED_URL_DURATION_SECONDS := _get_seconds("DINAMIS_SDK_DURATION_SECONDS")): + log.info( + "Setting duration seconds from environment variable to %s seconds", + SIGNED_URL_DURATION_SECONDS + ) MAX_URLS = 64 S3_STORAGE_DOMAIN = "meso.umontpellier.fr" diff --git a/setup.py b/setup.py index 79bf0a6..5781ee5 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ install_requires = [ setup( name="dinamis-sdk", - version="0.1.1", + version="0.1.2", description="DINAMIS SDK", python_requires=">=3.8", author="Remi Cresson", -- GitLab From 5566918670fe5288a2bbc45a617bb1eeb412ed14 Mon Sep 17 00:00:00 2001 From: Cresson Remi <remi.cresson@irstea.fr> Date: Fri, 12 Apr 2024 10:32:33 +0200 Subject: [PATCH 2/3] Update file .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5605c6..86c9856 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,4 +99,4 @@ pypi: script: - python3 -m build after_script: - - python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ --non-interactive -u __token__ -p $pypi_token dist/* + - python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ --non-interactive --verbose -u __token__ -p $pypi_token dist/* -- GitLab From 701073a066f2fe4424e92f044def080db42a6221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi?= <remi.cresson@inrae.fr> Date: Fri, 12 Apr 2024 10:36:41 +0200 Subject: [PATCH 3/3] add: logging --- dinamis_sdk/auth.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dinamis_sdk/auth.py b/dinamis_sdk/auth.py index 87b6dd3..40b7140 100644 --- a/dinamis_sdk/auth.py +++ b/dinamis_sdk/auth.py @@ -260,6 +260,7 @@ class TokenServer: session.mount("https://", adapter) session.mount("http://", adapter) self.endpoint = endpoint + log.info("Using Token Server: %s", endpoint) def get_access_token() -> str: return session.get(self.endpoint, timeout=10).json() -- GitLab