From ac1b9e9e9c0e391f560e2d1051cdc9b4460a91b6 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Wed, 19 Feb 2025 10:12:05 +0100
Subject: [PATCH 01/15] Update version retrieval
---
dinamis_sdk/__init__.py | 10 +++++++++-
pyproject.toml | 3 ---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dinamis_sdk/__init__.py b/dinamis_sdk/__init__.py
index 74ef432..45dedae 100644
--- a/dinamis_sdk/__init__.py
+++ b/dinamis_sdk/__init__.py
@@ -1,8 +1,9 @@
"""Dinamis SDK module."""
# flake8: noqa
+from importlib.metadata import version, PackageNotFoundError
+
-__version__ = "0.4.1"
from dinamis_sdk.signing import (
sign,
sign_inplace,
@@ -15,3 +16,10 @@ from dinamis_sdk.signing import (
from .oauth2 import OAuth2Session # noqa
from .upload import push
from .http import get_headers
+
+__version__ = "unknown"
+try:
+ __version__ = version("dinamis_sdk")
+except PackageNotFoundError:
+ # package is not installed
+ pass
diff --git a/pyproject.toml b/pyproject.toml
index 990cb53..247d68a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,6 +36,3 @@ disable = "W1203,R0903,E0401,W0622"
[tool.setuptools]
packages = ["dinamis_sdk"]
-
-[tool.setuptools.dynamic]
-version = {attr = "dinamis_sdk.__version__"}
--
GitLab
From a843d0a6b337cf541e60f4cdddf0c64a7d2fdc87 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Wed, 19 Feb 2025 14:08:27 +0100
Subject: [PATCH 02/15] Up
---
.gitignore | 1 +
dinamis_sdk/__init__.py | 7 +------
pyproject.toml | 11 +++++++----
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 589d079..b3d3402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ build/
dist/
*venv/
.vscode/
+_version.py
diff --git a/dinamis_sdk/__init__.py b/dinamis_sdk/__init__.py
index 45dedae..f5e58f5 100644
--- a/dinamis_sdk/__init__.py
+++ b/dinamis_sdk/__init__.py
@@ -17,9 +17,4 @@ from .oauth2 import OAuth2Session # noqa
from .upload import push
from .http import get_headers
-__version__ = "unknown"
-try:
- __version__ = version("dinamis_sdk")
-except PackageNotFoundError:
- # package is not installed
- pass
+from ._version import __version__
diff --git a/pyproject.toml b/pyproject.toml
index 247d68a..8eabaae 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,3 @@
-[build-system]
-requires = ["setuptools>=61.2"]
-build-backend = "setuptools.build_meta"
-
[project]
name = "dinamis-sdk"
authors = [{name = "inrae", email = "remi.cresson@inrae.fr"}]
@@ -23,6 +19,13 @@ dependencies = [
readme = "README.md"
license = {file = "LICENSE"}
+[build-system]
+requires = ["setuptools>=61.0", "setuptools_scm[toml]>=6.2"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]
+write_to = "dinamis_sdk/_version.py"
+
[project.scripts]
dinamis_cli = "dinamis_sdk.cli:app"
--
GitLab
From d16624f0987f490f834d911b5838b69a35b50e7f Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Wed, 19 Feb 2025 14:09:51 +0100
Subject: [PATCH 03/15] Remove unused line
---
dinamis_sdk/__init__.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/dinamis_sdk/__init__.py b/dinamis_sdk/__init__.py
index f5e58f5..05e0fbe 100644
--- a/dinamis_sdk/__init__.py
+++ b/dinamis_sdk/__init__.py
@@ -1,8 +1,6 @@
"""Dinamis SDK module."""
# flake8: noqa
-from importlib.metadata import version, PackageNotFoundError
-
from dinamis_sdk.signing import (
sign,
--
GitLab
From 7bdeb1d9f7f30d675adb538bb2886b3feacdf43c Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Wed, 19 Feb 2025 14:11:55 +0100
Subject: [PATCH 04/15] Fix git
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1bcbe9..398d1e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,7 @@ pip_install:
before_script:
- python --version ; pip --version
script:
+ - apt update && apt install -y git
- pip install .
- pip list -v
--
GitLab
From ed95469c909b6bbdfb7dbc9d9c48ae2ecfc90499 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Wed, 19 Feb 2025 14:15:58 +0100
Subject: [PATCH 05/15] Fix ci
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 398d1e9..926521a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,7 @@ cache:
- .venv
before_script:
+ - apt update && apt install -y git
- pip install virtualenv
- virtualenv .venv
- source .venv/bin/activate
--
GitLab
From 9ce49bc234fb61968ef1d3dd7f27ad5e88169809 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Wed, 19 Feb 2025 14:24:33 +0100
Subject: [PATCH 06/15] Remove write_to
---
dinamis_sdk/__init__.py | 6 +++++-
pyproject.toml | 1 -
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dinamis_sdk/__init__.py b/dinamis_sdk/__init__.py
index 05e0fbe..3d58f79 100644
--- a/dinamis_sdk/__init__.py
+++ b/dinamis_sdk/__init__.py
@@ -2,6 +2,7 @@
# flake8: noqa
+from importlib.metadata import version, PackageNotFoundError
from dinamis_sdk.signing import (
sign,
sign_inplace,
@@ -15,4 +16,7 @@ from .oauth2 import OAuth2Session # noqa
from .upload import push
from .http import get_headers
-from ._version import __version__
+try:
+ __version__ = version("dinamis_sdk")
+except PackageNotFoundError:
+ pass
diff --git a/pyproject.toml b/pyproject.toml
index 8eabaae..eac0406 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,6 @@ requires = ["setuptools>=61.0", "setuptools_scm[toml]>=6.2"]
build-backend = "setuptools.build_meta"
[tool.setuptools_scm]
-write_to = "dinamis_sdk/_version.py"
[project.scripts]
dinamis_cli = "dinamis_sdk.cli:app"
--
GitLab
From 5d135d2e2dfcd8b3136fbd831a4a6177b7c50b15 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 11:20:30 +0100
Subject: [PATCH 07/15] Update ci
---
.gitlab-ci.yml | 21 ++++++++-------------
pyproject.toml | 5 ++++-
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 926521a..0caa03f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,11 +16,6 @@ before_script:
- source .venv/bin/activate
- pip install -e .
-workflow:
- rules:
- - if: $CI_MERGE_REQUEST_ID
- - if: $CI_COMMIT_BRANCH == 'main'
-
stages:
- Install
- Static Analysis
@@ -99,15 +94,15 @@ mypy:
test:
extends: .doc_base
- except:
- - main
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "false"
script:
- mkdocs build --site-dir public_test
pages:
extends: .doc_base
- only:
- - main
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
script:
- mkdocs build --site-dir public
@@ -117,8 +112,8 @@ pages:
needs:
- pip_install
stage: Test
- except:
- - main
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "false"
Misc Tests:
extends: .tests_base
@@ -156,8 +151,8 @@ API key Tests:
pypi:
stage: Ship
- only:
- - main
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
before_script:
- python3 -m pip install --upgrade build twine
script:
diff --git a/pyproject.toml b/pyproject.toml
index eac0406..de34b3f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,9 @@
[project]
name = "dinamis-sdk"
-authors = [{name = "inrae", email = "remi.cresson@inrae.fr"}]
+authors = [
+ {name = "Rémi Cresson", email = "remi.cresson@inrae.fr"},
+ {name = "Pablo Boizeau", email = "pablo.boizeau@ird.fr"}
+ ]
dynamic = ["version"]
description = "DINAMIS SDK for Python"
requires-python = ">=3.7"
--
GitLab
From 178028c32695b38d5e2b72c55d02930374c71969 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 11:26:57 +0100
Subject: [PATCH 08/15] Update ci script
---
.gitlab-ci.yml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0caa03f..5cf7e05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,6 @@ stages:
- Documentation
# ------------------------------- Install -------------------------------------
-
pip_install:
stage: Install
before_script:
@@ -35,7 +34,6 @@ pip_install:
- pip list -v
# ------------------------------ Static analysis ------------------------------
-
.static_analysis_base:
stage: Static Analysis
allow_failure: false
@@ -82,7 +80,6 @@ mypy:
- mypy --install-types --non-interactive .
# --------------------------------- Doc ---------------------------------------
-
.doc_base:
stage: Documentation
before_script:
@@ -107,7 +104,6 @@ pages:
- mkdocs build --site-dir public
# --------------------------------- Test --------------------------------------
-
.tests_base:
needs:
- pip_install
@@ -148,7 +144,6 @@ API key Tests:
- dinamis_cli revoke ${DINAMIS_SDK_ACCESS_KEY}
# --------------------------------- Ship --------------------------------------
-
pypi:
stage: Ship
rules:
--
GitLab
From 63b0cd104e31f8a5f096f84c068b48f8c0e703a3 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 11:35:56 +0100
Subject: [PATCH 09/15] Use gitlab ci includes
---
.gitlab-ci.yml | 127 +++++++------------------------------------------
1 file changed, 18 insertions(+), 109 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cf7e05..4169ea0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,115 +1,36 @@
-default:
- image: python:3.12-slim
+include:
+ - project: "cdos-pub/pycode-quality"
+ ref: "main"
+ file:
+ - ".gitlab/ci/static-analysis.yml"
+ - ".gitlab/ci/doc.yml"
+ - ".gitlab/ci/pip.yml"
variables:
- PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+ IMPL_MODULE_NAME: dinamis_sdk
-cache:
- paths:
- - .cache/pip
- - .venv
+ PYTHON_IMG: python:3.12-slim
+ PIP_RASTERIO_USED: true
+ PIP_PACKAGE_URL: "https://upload.pypi.org/legacy/"
+ TWINE_USERNAME: __token__
+ TWINE_PASSWORD: ${PYPI_TOKEN}
-before_script:
- - apt update && apt install -y git
- - pip install virtualenv
- - virtualenv .venv
- - source .venv/bin/activate
- - pip install -e .
+ DOC_BUILD_SELF: true
stages:
- - Install
- Static Analysis
- Test
- - Ship
- Documentation
+ - Pip
-# ------------------------------- Install -------------------------------------
-pip_install:
- stage: Install
- before_script:
- - python --version ; pip --version
- script:
- - apt update && apt install -y git
- - pip install .
- - pip list -v
-
-# ------------------------------ Static analysis ------------------------------
.static_analysis_base:
- stage: Static Analysis
allow_failure: false
-flake8:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install flake8
- - flake8 --ignore E501 ./dinamis_sdk
-
-pylint:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install pylint
- - pylint ./dinamis_sdk
-
-codespell:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install codespell
- - codespell ./dinamis_sdk docs README.md
-
-pydocstyle:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install pydocstyle
- - pydocstyle ./dinamis_sdk
-
-mypy:
- needs:
- - pip_install
- extends: .static_analysis_base
- script:
- - pip install mypy
- - pip list -v
- - mypy --install-types --non-interactive .
-
-# --------------------------------- Doc ---------------------------------------
-.doc_base:
- stage: Documentation
- before_script:
- - pip install -r doc/doc_requirements.txt
- artifacts:
- paths:
- - public
- - public_test
-
-test:
- extends: .doc_base
- rules:
- - if: $CI_COMMIT_REF_PROTECTED == "false"
- script:
- - mkdocs build --site-dir public_test
-
-pages:
- extends: .doc_base
- rules:
- - if: $CI_COMMIT_REF_PROTECTED == "true"
- script:
- - mkdocs build --site-dir public
-
-# --------------------------------- Test --------------------------------------
.tests_base:
- needs:
- - pip_install
+ extends: .static_analysis_with_pip_install
stage: Test
- rules:
- - if: $CI_COMMIT_REF_PROTECTED == "false"
+ except:
+ - $CI_COMMIT_REF_PROTECTED == "true"
Misc Tests:
extends: .tests_base
@@ -142,15 +63,3 @@ API key Tests:
# bring back oauth2 credentials so we can revoke the API key
- mv /root/.config/dinamis_sdk_auth/.jwt_ /root/.config/dinamis_sdk_auth/.jwt
- dinamis_cli revoke ${DINAMIS_SDK_ACCESS_KEY}
-
-# --------------------------------- Ship --------------------------------------
-pypi:
- stage: Ship
- rules:
- - if: $CI_COMMIT_REF_PROTECTED == "true"
- before_script:
- - python3 -m pip install --upgrade build twine
- script:
- - python3 -m build
- after_script:
- - python3 -m twine upload --repository-url https://upload.pypi.org/legacy/ --non-interactive --verbose -u __token__ -p $pypi_token dist/*
--
GitLab
From f58ac6da2ea888258e8b8eb30560dcfebe7875f9 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 11:39:42 +0100
Subject: [PATCH 10/15] Reformat
---
tests/test_headers.py | 2 +-
tests/test_misc.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/test_headers.py b/tests/test_headers.py
index 0a5e85c..831b60c 100644
--- a/tests/test_headers.py
+++ b/tests/test_headers.py
@@ -2,6 +2,6 @@ import sys
import dinamis_sdk
headers = dinamis_sdk.get_headers()
-print(f'Got headers: {headers}')
+print(f"Got headers: {headers}")
assert headers
assert headers.get(sys.argv[1])
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 52342da..b5dba0e 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -12,6 +12,6 @@ except PackageNotFoundError:
assert version_from_module
assert version_from_pkg
-assert (
- version_from_module == version_from_pkg
-), f"version from module is {version_from_module} but version from pkg is {version_from_pkg}"
+assert version_from_module == version_from_pkg, (
+ f"version from module is {version_from_module} but version from pkg is {version_from_pkg}"
+)
--
GitLab
From d1dd00b0e972666e4d5902339983d2355640f5dc Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 11:44:32 +0100
Subject: [PATCH 11/15] Fix codespell
---
doc/advanced.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/advanced.md b/doc/advanced.md
index 3cfd9ea..3aa0a93 100644
--- a/doc/advanced.md
+++ b/doc/advanced.md
@@ -19,7 +19,7 @@ this environment variable, in seconds.
- `DINAMIS_SDK_BYPASS_AUTH_API`:
Use this environment variable to use a different signing API endpoint,
-with no authentication mecanism.
+with no authentication mechanism.
- `DINAMIS_SDK_CONFIG_DIR`:
The default config directory used to store authentication credentials (i.e.
--
GitLab
From 0d0e4442f5da1985f2e04862a3b0f89f7d4e2976 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 11:51:42 +0100
Subject: [PATCH 12/15] Clear cache
---
.gitlab-ci.yml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4169ea0..c3e6dc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,17 @@ stages:
.static_analysis_base:
allow_failure: false
+.static_analysis_with_pip_install:
+ before_script:
+ - apt update && apt install -y git && apt clean # Install git for setuptools_scm
+ - python --version; pip --version
+ # Install libexpat, required for rasterio
+ - if [ "$PIP_RASTERIO_USED" == "true" ]; then apt-get update; apt-get install libexpat1; apt-get clean; fi
+ # See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#dependencies-optional-dependencies
+ - pip install -e ".${PACKAGE_INSTALL_EXTRAS}"
+ - pip list -v
+ - rm -rf .venv
+
.tests_base:
extends: .static_analysis_with_pip_install
stage: Test
--
GitLab
From 8125a0e7c68fae4df93540a45e5c0a708f4e1b52 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 11:59:28 +0100
Subject: [PATCH 13/15] Remove cache clear
---
.gitlab-ci.yml | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3e6dc5..4169ea0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,17 +26,6 @@ stages:
.static_analysis_base:
allow_failure: false
-.static_analysis_with_pip_install:
- before_script:
- - apt update && apt install -y git && apt clean # Install git for setuptools_scm
- - python --version; pip --version
- # Install libexpat, required for rasterio
- - if [ "$PIP_RASTERIO_USED" == "true" ]; then apt-get update; apt-get install libexpat1; apt-get clean; fi
- # See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#dependencies-optional-dependencies
- - pip install -e ".${PACKAGE_INSTALL_EXTRAS}"
- - pip list -v
- - rm -rf .venv
-
.tests_base:
extends: .static_analysis_with_pip_install
stage: Test
--
GitLab
From 5f9d74dd54deca6e098a5426952e8a8d84a1c220 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 12:06:47 +0100
Subject: [PATCH 14/15] Fix ci
---
.gitlab-ci.yml | 17 +++++++++--------
tests/test_headers.py | 2 ++
tests/test_misc.py | 17 -----------------
tests/test_push.py | 4 ++--
...est_spot-6-7-drs.py => test_spot_6_7_drs.py} | 0
tests/{test_super-s2.py => test_super_s2.py} | 2 +-
6 files changed, 14 insertions(+), 28 deletions(-)
delete mode 100644 tests/test_misc.py
rename tests/{test_spot-6-7-drs.py => test_spot_6_7_drs.py} (100%)
rename tests/{test_super-s2.py => test_super_s2.py} (96%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4169ea0..864458b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,16 +32,17 @@ stages:
except:
- $CI_COMMIT_REF_PROTECTED == "true"
-Misc Tests:
- extends: .tests_base
+pylint:
script:
- - python tests/test_misc.py
+ - pip install pylint
+ - pylint dinamis_sdk tests
+
OAuth2 Tests:
extends: .tests_base
script:
- - python tests/test_spot-6-7-drs.py
- - python tests/test_super-s2.py
+ - python tests/test_spot_6_7_drs.py
+ - python tests/test_super_s2.py
- python tests/test_push.py
- python tests/test_headers.py authorization
@@ -52,14 +53,14 @@ API key Tests:
- python tests/test_headers.py access-key
# ensure that we une only API key from now
- mv /root/.config/dinamis_sdk_auth/.jwt /root/.config/dinamis_sdk_auth/.jwt_
- - python tests/test_spot-6-7-drs.py
- - python tests/test_super-s2.py
+ - python tests/test_spot_6_7_drs.py
+ - python tests/test_super_s2.py
- python tests/test_push.py
# Test API key from environment variables
- export DINAMIS_SDK_ACCESS_KEY=$(cat /root/.config/dinamis_sdk_auth/.apikey | cut -d'"' -f4)
- export DINAMIS_SDK_SECRET_KEY=$(cat /root/.config/dinamis_sdk_auth/.apikey | cut -d'"' -f8)
- rm /root/.config/dinamis_sdk_auth/.apikey # ensure that we use env. vars.
- - python tests/test_spot-6-7-drs.py
+ - python tests/test_spot_6_7_drs.py
# bring back oauth2 credentials so we can revoke the API key
- mv /root/.config/dinamis_sdk_auth/.jwt_ /root/.config/dinamis_sdk_auth/.jwt
- dinamis_cli revoke ${DINAMIS_SDK_ACCESS_KEY}
diff --git a/tests/test_headers.py b/tests/test_headers.py
index 831b60c..6180b31 100644
--- a/tests/test_headers.py
+++ b/tests/test_headers.py
@@ -1,3 +1,5 @@
+"""Header test module."""
+
import sys
import dinamis_sdk
diff --git a/tests/test_misc.py b/tests/test_misc.py
deleted file mode 100644
index b5dba0e..0000000
--- a/tests/test_misc.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import dinamis_sdk
-
-from importlib.metadata import PackageNotFoundError, version
-
-version_from_module = dinamis_sdk.__version__
-
-try:
- version_from_pkg = version("dinamis_sdk")
-except PackageNotFoundError:
- # package is not installed
- version_from_pkg = ""
-
-assert version_from_module
-assert version_from_pkg
-assert version_from_module == version_from_pkg, (
- f"version from module is {version_from_module} but version from pkg is {version_from_pkg}"
-)
diff --git a/tests/test_push.py b/tests/test_push.py
index f61c719..4340983 100755
--- a/tests/test_push.py
+++ b/tests/test_push.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+"""Push test module."""
import requests
@@ -6,7 +6,7 @@ import dinamis_sdk
LOCAL_FILENAME = "/tmp/toto.txt"
-with open(LOCAL_FILENAME, "w") as f:
+with open(LOCAL_FILENAME, "w", encoding="utf-8") as f:
f.write("hello world")
TARGET_URL = "https://s3-data.meso.umontpellier.fr/sm1-gdc-tests/titi.txt"
diff --git a/tests/test_spot-6-7-drs.py b/tests/test_spot_6_7_drs.py
similarity index 100%
rename from tests/test_spot-6-7-drs.py
rename to tests/test_spot_6_7_drs.py
diff --git a/tests/test_super-s2.py b/tests/test_super_s2.py
similarity index 96%
rename from tests/test_super-s2.py
rename to tests/test_super_s2.py
index eb54991..e681998 100755
--- a/tests/test_super-s2.py
+++ b/tests/test_super_s2.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+"""Super S2 test module."""
import pystac
import pystac_client
--
GitLab
From 8030a7180cfe06c7d5b39ad0b91de3b847523d94 Mon Sep 17 00:00:00 2001
From: Pablo Boizeau <pablo.boizeau@ird.fr>
Date: Thu, 20 Feb 2025 12:09:02 +0100
Subject: [PATCH 15/15] Fix typo
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 864458b..3ddfad1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
PIP_RASTERIO_USED: true
PIP_PACKAGE_URL: "https://upload.pypi.org/legacy/"
TWINE_USERNAME: __token__
- TWINE_PASSWORD: ${PYPI_TOKEN}
+ TWINE_PASSWORD: ${pypi_token}
DOC_BUILD_SELF: true
--
GitLab