OMerge remote-tracking branch 'origin/develop' into feat-rspy544/invalid-catalog-download-links

Author: alinbutu

.github/workflows/check-code-quality.yml

@@ -16,6 +16,10 @@ name: Check code quality
 
 on:
   push:
+    branches:
+      - develop # pushes on the 'develop' branch
+    tags:
+      - '**' # new git tags (including hierarchical tags like v1.0/beta)
   pull_request:
     types: [opened, synchronize, reopened]
     # run this worflow only for code/test related changes (avoid it for documentation)

docs/poetry.lock

@@ -63,23 +63,23 @@ optional = true
 # All the dev dependencies are set here so they can be used by the CI.
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.3"
-pytest-asyncio = "^0.25.1"
+pytest-asyncio = "^0.25.3"
 pytest-cov = "^6.0.0"
 pytest-docker = "^3.1.0"
 pytest-error-for-skips = "^2.0.2"
 pytest-httpx = "^0.34.0"
 pytest-mock = "^3.14.0"
-black = "^24.10.0"
+black = "^25.1.0"
 mypy = "^1.14.1"
-pre-commit = "^4.0.1"
+pre-commit = "^4.1.0"
 types-requests = "^2.32.0.20241016"
 flake8 = "^7.1.1"
 bandit = "^1.8.2"
 safety = "^3.2.14"
 pylint = "^3.3.0"
 flake8-pyproject = "^1.2.3"
 httpx = "^0.27.2"
-moto = "==5.0.26"
+moto = "==5.0.27"
 flask = "^3.0.3"
 flask-cors = "^5.0.0"
 sphinx = "^8.1.3"

poetry.lock

@@ -38,28 +38,6 @@ else
     cd "stac-browser"
 fi
 
-# The docker entrypoint will run the script 'docker/docker-entrypoint.sh'
-# and create the config.js file that will contain: window.STAC_BROWSER_CONFIG = {...}
-# We add a sed command to the .sh script that will modify the .js file to add
-# the oauth2 configuration based on environment variables: OIDC_ENDPOINT, OIDC_REALM, PUBLIC_CLIENT_ID
-#
-# Note: we substitute env vars in ThisIsUsedBySed, not in "ThisGoesToEntrypointSh"
-cat <<- "ThisGoesToEntrypointSh" >> docker/docker-entrypoint.sh
-
-# This was added by https://github.com/RS-PYTHON/rs-server/tree/develop/resources/deploy_stac_browser.sh
-authConfig=$(cat <<- ThisIsUsedBySed
-  authConfig: { \n\
-    "type": "openIdConnect", \n\
-    "openIdConnectUrl": "${OIDC_ENDPOINT}/realms/${OIDC_REALM}/.well-known/openid-configuration", \n\
-    "oidcConfig": { \n\
-      "client_id": "${PUBLIC_CLIENT_ID}" \n\
-    } \n\
-  },
-ThisIsUsedBySed
-)
-sed -i "s@\(window.STAC_BROWSER_CONFIG = {\)@\1\n$authConfig@g" /usr/share/nginx/html/config.js
-ThisGoesToEntrypointSh
-
 # Docker image tag = 'last commit hash'.'last commit date'
 tag="$(git rev-parse --short HEAD).$(git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m-%d)"
 

pyproject.toml

@@ -50,7 +50,7 @@ pytest-docker = "^3.1.0"
 pytest-error-for-skips = "^2.0.2"
 pytest-httpx = ">=0.32,<0.35"
 pytest-mock = "^3.12.0"
-black = "^24.8.0"
+black = ">=24.8,<26.0"
 mypy = "^1.11.2"
 orjson = [ # we need the same markers and versions as in eodag: https://github.com/CS-SI/eodag/blob/develop/setup.cfg
     {version = "<3.10.0", markers = "python_version>='3.12' and platform_system=='Windows'"},

resources/deploy_stac_browser.sh

@@ -100,7 +100,7 @@ def process_search(
         limit: int,
         page: int,
     ) -> stac_pydantic.ItemCollection:
-        """Do the search for the given collection and OData parameters."""
+        """Search adgs products for the given collection and OData parameters."""
 
         return process_product_search(
             collection.get("station", "adgs"),