Skip to content

Commit 1bb809a

Browse files
author
Alex Grosu
committed
Merge remote-tracking branch 'origin/develop' into feat-rspy582/remove-deprecated-code
2 parents 4eec020 + f08310e commit 1bb809a

File tree

33 files changed

+1937
-1839
lines changed

33 files changed

+1937
-1839
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ name: Check code quality
1616

1717
on:
1818
push:
19+
branches:
20+
- develop # pushes on the 'develop' branch
21+
tags:
22+
- '**' # new git tags (including hierarchical tags like v1.0/beta)
1923
pull_request:
2024
types: [opened, synchronize, reopened]
2125
# run this worflow only for code/test related changes (avoid it for documentation)

docs/poetry.lock

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

poetry.lock

Lines changed: 267 additions & 257 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ optional = true
6363
# All the dev dependencies are set here so they can be used by the CI.
6464
[tool.poetry.group.dev.dependencies]
6565
pytest = "^8.3.3"
66-
pytest-asyncio = "^0.25.1"
66+
pytest-asyncio = "^0.25.3"
6767
pytest-cov = "^6.0.0"
68-
pytest-docker = "^3.1.0"
68+
pytest-docker = "^3.1.2"
6969
pytest-error-for-skips = "^2.0.2"
7070
pytest-httpx = "^0.34.0"
7171
pytest-mock = "^3.14.0"
72-
black = "^24.10.0"
73-
mypy = "^1.14.1"
72+
black = "^25.1.0"
73+
mypy = "^1.15.0"
7474
pre-commit = "^4.1.0"
7575
types-requests = "^2.32.0.20241016"
7676
flake8 = "^7.1.1"
@@ -79,7 +79,7 @@ safety = "^3.2.14"
7979
pylint = "^3.3.0"
8080
flake8-pyproject = "^1.2.3"
8181
httpx = "^0.27.2"
82-
moto = "==5.0.27"
82+
moto = "==5.0.28"
8383
flask = "^3.0.3"
8484
flask-cors = "^5.0.0"
8585
sphinx = "^8.1.3"

resources/deploy_stac_browser.sh

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,6 @@ else
3838
cd "stac-browser"
3939
fi
4040

41-
# The docker entrypoint will run the script 'docker/docker-entrypoint.sh'
42-
# and create the config.js file that will contain: window.STAC_BROWSER_CONFIG = {...}
43-
# We add a sed command to the .sh script that will modify the .js file to add
44-
# the oauth2 configuration based on environment variables: OIDC_ENDPOINT, OIDC_REALM, PUBLIC_CLIENT_ID
45-
#
46-
# Note: we substitute env vars in ThisIsUsedBySed, not in "ThisGoesToEntrypointSh"
47-
cat <<- "ThisGoesToEntrypointSh" >> docker/docker-entrypoint.sh
48-
49-
# This was added by https://github.com/RS-PYTHON/rs-server/tree/develop/resources/deploy_stac_browser.sh
50-
authConfig=$(cat <<- ThisIsUsedBySed
51-
authConfig: { \n\
52-
"type": "openIdConnect", \n\
53-
"openIdConnectUrl": "${OIDC_ENDPOINT}/realms/${OIDC_REALM}/.well-known/openid-configuration", \n\
54-
"oidcConfig": { \n\
55-
"client_id": "${PUBLIC_CLIENT_ID}" \n\
56-
} \n\
57-
},
58-
ThisIsUsedBySed
59-
)
60-
sed -i "s@\(window.STAC_BROWSER_CONFIG = {\)@\1\n$authConfig@g" /usr/share/nginx/html/config.js
61-
ThisGoesToEntrypointSh
62-
6341
# Docker image tag = 'last commit hash'.'last commit date'
6442
tag="$(git rev-parse --short HEAD).$(git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m-%d)"
6543

0 commit comments

Comments
 (0)