Skip to content

Commit af633e4

Browse files
mishaschwartzmishaschwartz
committed
Merge branch 'master' into delete-old-files
2 parents f36262f + 6143ac3 commit af633e4

File tree

20 files changed

+487
-151
lines changed

20 files changed

+487
-151
lines changed

‎.bumpversion.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tool.bumpversion]
2-
current_version = "2.16.12"
2+
current_version = "2.17.1"
33
commit = true
44
tag = false
55
tag_name = "{new_version}"

‎.github/labeler.yml‎

Lines changed: 74 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,75 +7,103 @@
77
# we refer here to CI as the 'meta' configuration files for managing the code and integrations with the repository,
88
# not configurations related to the deployment process itself.
99
ci/operations:
10-
- .* # all '.<something>' files
11-
- .github/**/*
12-
- docs/Makefile
13-
- Dockerfile*
14-
- birdhouse/docker/**/*
15-
- tests/**/*
10+
- changed-files:
11+
- any-glob-to-any-file:
12+
- .* # all '.<something>' files
13+
- .github/**/*
14+
- docs/Makefile
15+
- Dockerfile*
16+
- birdhouse/docker/**/*
17+
- tests/**/*
1618

1719
ci/deployment:
18-
- birdhouse/deployment/**/*
19-
- birdhouse/scripts/**/*
20-
- birdhouse/templates/**/*
21-
- birdhouse/vagrant-utils/**/*
22-
- vagrant_variables.yml.example
23-
- Vagrantfile
24-
- birdhouse/**/*.include.sh
25-
- birdhouse/pavics-compose.sh
26-
- birdhouse/birdhouse-compose.sh
20+
- changed-files:
21+
- any-glob-to-any-file:
22+
- birdhouse/deployment/**/*
23+
- birdhouse/scripts/**/*
24+
- birdhouse/templates/**/*
25+
- birdhouse/vagrant-utils/**/*
26+
- vagrant_variables.yml.example
27+
- Vagrantfile
28+
- birdhouse/**/*.include.sh
29+
- birdhouse/pavics-compose.sh
30+
- birdhouse/birdhouse-compose.sh
2731

2832
ci/tests:
29-
- "**/test*/**/*" # eg: optional-components/test...
30-
- tests/**/*
33+
- changed-files:
34+
- any-glob-to-any-file:
35+
- "**/test*/**/*" # eg: optional-components/test...
36+
- tests/**/*
3137

3238
documentation:
33-
- "*.rst"
34-
- "*.example"
35-
- ".readthedocs.yml"
36-
- ".zenodo.json"
37-
- docs/**/*
38-
- CONTRIBUTING.rst
39-
- CHANGES.md
40-
- LICENSE
41-
- "**/README.rst"
39+
- changed-files:
40+
- any-glob-to-any-file:
41+
- "*.rst"
42+
- "*.example"
43+
- ".readthedocs.yml"
44+
- ".zenodo.json"
45+
- docs/**/*
46+
- CONTRIBUTING.rst
47+
- CHANGES.md
48+
- LICENSE
49+
- "**/README.rst"
4250

4351
component/weaver:
44-
- birdhouse/**/weaver/**/*
52+
- changed-files:
53+
- any-glob-to-any-file:
54+
- birdhouse/**/weaver/**/*
4555

4656
component/cowbird:
47-
- birdhouse/**/cowbird/**/*
57+
- changed-files:
58+
- any-glob-to-any-file:
59+
- birdhouse/**/cowbird/**/*
4860

4961
component/magpie:
50-
- birdhouse/**/magpie/**/*
62+
- changed-files:
63+
- any-glob-to-any-file:
64+
- birdhouse/**/magpie/**/*
5165

5266
component/twitcher:
53-
- birdhouse/**/twitcher/**/*
67+
- changed-files:
68+
- any-glob-to-any-file:
69+
- birdhouse/**/twitcher/**/*
5470

5571
component/THREDDS:
56-
- birdhouse/**/thredds/**/*
72+
- changed-files:
73+
- any-glob-to-any-file:
74+
- birdhouse/**/thredds/**/*
5775

5876
component/geoserver:
59-
- birdhouse/**/geoserver/**/*
60-
- docker/geoserver/**/*
77+
- changed-files:
78+
- any-glob-to-any-file:
79+
- birdhouse/**/geoserver/**/*
80+
- docker/geoserver/**/*
6181

6282
component/jupyterhub:
63-
- birdhouse/**/jupyterhub/**/*
83+
- changed-files:
84+
- any-glob-to-any-file:
85+
- birdhouse/**/jupyterhub/**/*
6486

6587
component/STAC:
66-
- birdhouse/**/*stac*/**/*
88+
- changed-files:
89+
- any-glob-to-any-file:
90+
- birdhouse/**/*stac*/**/*
6791

6892
feature/WPS:
69-
- birdhouse/**/finch/**/*
70-
- birdhouse/**/flyingpigeon/**/*
71-
- birdhouse/**/hummingbird/**/*
72-
- birdhouse/**/malleefowl/**/*
73-
- birdhouse/**/raven/**/*
74-
- birdhouse/**/weaver/**/*
75-
- birdhouse/**/wps_output-volume/**/*
76-
- birdhouse/**/*wps*/**/*
93+
- changed-files:
94+
- any-glob-to-any-file:
95+
- birdhouse/**/finch/**/*
96+
- birdhouse/**/flyingpigeon/**/*
97+
- birdhouse/**/hummingbird/**/*
98+
- birdhouse/**/malleefowl/**/*
99+
- birdhouse/**/raven/**/*
100+
- birdhouse/**/weaver/**/*
101+
- birdhouse/**/wps_output-volume/**/*
102+
- birdhouse/**/*wps*/**/*
77103

78104
feature/node-registry:
79-
- birdhouse/**/service-config.json.template
80-
- birdhouse/scripts/get-version.include.sh
81-
- birdhouse/scripts/get-services-json.include.sh
105+
- changed-files:
106+
- any-glob-to-any-file:
107+
- birdhouse/**/service-config.json.template
108+
- birdhouse/scripts/get-version.include.sh
109+
- birdhouse/scripts/get-services-json.include.sh

‎CHANGES.md‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,94 @@
2424

2525
(see `env.local.example` or the `scheduler` documentation for details).
2626

27+
[2.17.1](https://github.com/bird-house/birdhouse-deploy/tree/2.17.1) (2025-09-10)
28+
------------------------------------------------------------------------------------------------------------------
29+
30+
## Fixes
31+
32+
- Weaver: Fix invalid JSON/HTML media-types for reported `/services` links without explicit format indicator.
33+
34+
[2.17.0](https://github.com/bird-house/birdhouse-deploy/tree/2.17.0) (2025-09-02)
35+
------------------------------------------------------------------------------------------------------------------
36+
37+
## Changes
38+
39+
- STAC: Update STAC Browser to
40+
[`crim-ca/stac-browser:3.4.0-dev`](https://github.com/crim-ca/stac-browser/releases/tag/3.4.0-dev).
41+
42+
- Dockers are now built directly with the GitHub CI releases
43+
(see https://github.com/crim-ca/stac-browser/pkgs/container/stac-browser).
44+
- Synchronize with latest changes (as of 2025-08-16).
45+
- Beside the necessary `prefixPath` override for Nginx Proxy redirect and a minor HTML file resolution fix,
46+
the image is entirely up-to-date with the official upstream code.
47+
- Supports STAC 1.1.0.
48+
- Supports language locales.
49+
- Greatly improves parsing of STAC metadata and their visual rendering.
50+
- Allows dynamic runtime [config.js](https://github.com/radiantearth/stac-browser/blob/main/config.js) overrides.
51+
For the time being, only the required `catalogUrl` is overridden, but further settings could be added later on.
52+
53+
- STAC: Update STAC API to `crim-ca/stac-app:2.0.1`.
54+
55+
- Changes in [`crim-ca/stac-app:2.0.0`](https://github.com/crim-ca/stac-app/releases/tag/2.0.0) includes:
56+
- migration to `stac-fastapi==6.0.0` and corresponding fixes to support it
57+
- add `q` parameter free-text search on `/search`, `/collections` and `/collections/{collectionId}/items` endpoints
58+
- enforce JSON schema validation of all `stac_extensions` referenced by published STAC Items and Collections
59+
- multiple dependency updates
60+
- Minor package dependency fix in [`crim-ca/stac-app:2.0.1`](https://github.com/crim-ca/stac-app/releases/tag/2.0.1).
61+
62+
- STAC: Update `stac-db` and `stac-migration` to version `0.9.8`.
63+
64+
- STAC: Add `optional/stac-db-persist` and `STAC_DB_PERSIST_DIR` to allow custom STAC DB metadata storage location.
65+
66+
- Drop unsupported `pytest-lazy-fixture` python package for tests
67+
68+
This package is no longer maintained and breaks for `pytest` versions 8+. We do not need it for our tests so
69+
it was dropped. In the future if we need to support lazy fixtures we should use the `pytest-lazy-fixtures`
70+
package instead (which is actively maintained).
71+
72+
- Dependabot automated updates for Python dependencies.
73+
74+
The following Python dependencies were updated to their most recent compatible releases:
75+
- `jsonschema`: 4.17.1 -> 4.25.1
76+
- `prometheus-client`: 0.22.0 -> 0.22.1
77+
- `pytest`: 7.2.2 -> 8.4.1
78+
- `python-dotenv`: 1.0.1 -> 1.1.1
79+
- `requests`: 2.32.4 -> 2.32.5
80+
81+
## Fixes
82+
83+
- Backup: Fix STAC representative data restore operation (`birdhouse backup restore -r stac`).
84+
85+
- Change the default `STAC_POPULATOR_BACKUP_VERSION=0.9.0` to employ
86+
the [Dockerfile of `stac-populator`](https://github.com/crim-ca/stac-populator/blob/master/docker/Dockerfile)
87+
fix with preconfigured `PYESSV_ARCHIVE_HOME` directory.
88+
- Add `stac-migration` along `stac-db` to the list of stopped/restored containers to ensure that the `stac-db`
89+
volume used by both does not yield a docker daemon error of "volume in use", and to apply any relevant
90+
migration scripts on the recreated `stac-db` volume.
91+
92+
[2.16.14](https://github.com/bird-house/birdhouse-deploy/tree/2.16.14) (2025-08-27)
93+
------------------------------------------------------------------------------------------------------------------
94+
95+
## Fixes
96+
97+
- Updated configuration of `.github/labeler.yml` to follow the new `actions/labeler` v5.0 conventions.
98+
99+
In `Birdhouse-deploy` v2.16.11, the `actions/labeler` action was updated to v5.0 which introduced a new configuration
100+
format for the `.github/labeler.yml` file. This change updates the configuration to follow the new format. See:
101+
[actions/labeler v5.0 release notes](https://github.com/actions/labeler/releases/tag/v5.0.0).
102+
103+
[2.16.13](https://github.com/bird-house/birdhouse-deploy/tree/2.16.13) (2025-08-27)
104+
------------------------------------------------------------------------------------------------------------------
105+
106+
## Changes
107+
108+
- Updated the `finch` service to v0.12.1.
109+
110+
This is a significant jump from the previous version (v0.9.2) and includes many bug fixes and dependency updates:
111+
112+
- anyascii (replacement for unidecode)
113+
- xclim v0.43.0 (previously xclim v0.37)
114+
27115
[2.16.12](https://github.com/bird-house/birdhouse-deploy/tree/2.16.12) (2025-08-27)
28116
------------------------------------------------------------------------------------------------------------------
29117

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ override BIRDHOUSE_MAKE_DIR := $(shell realpath -P $$(dirname $(BIRDHOUSE_MAKE_C
88
# Generic variables
99
override SHELL := bash
1010
override APP_NAME := birdhouse-deploy
11-
override APP_VERSION := 2.16.12
11+
override APP_VERSION := 2.17.1
1212

1313
# utility to remove comments after value of an option variable
1414
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

‎README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ for a full-fledged production platform.
1818
* - citation
1919
- | |citation|
2020

21-
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.16.12.svg
21+
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.17.1.svg
2222
:alt: Commits since latest release
23-
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.16.12...master
23+
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.17.1...master
2424

25-
.. |latest-version| image:: https://img.shields.io/badge/tag-2.16.12-blue.svg?style=flat
25+
.. |latest-version| image:: https://img.shields.io/badge/tag-2.17.1-blue.svg?style=flat
2626
:alt: Latest Tag
27-
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.16.12
27+
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.17.1
2828

2929
.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
3030
:alt: ReadTheDocs Build Status (latest version)

‎RELEASE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.16.12 2025-08-27T13:46:51Z
1+
2.17.1 2025-09-10T08:30:42Z

‎bin/birdhouse‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@ do_component_backup_create_restore() {
417417
fi
418418
done
419419
fi
420+
log DEBUG "Running component backup/restore [${backup_restore_type}] for components: [${confdirs}]"
420421
for confdir in ${confdirs}; do
421422
backup_script="$(cd "${COMPOSE_DIR}"; readlink -f "${confdir}/backup" 2>/dev/null || realpath "${confdir}/backup" 2>/dev/null)"
422423
if [ -n "${backup_script}" ] && [ -f "${backup_script}" ]; then

‎birdhouse/components/canarie-api/docker_configuration.py.template‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ SERVICES = {
108108
# NOTE:
109109
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
110110
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
111-
'version': '2.16.12',
112-
'releaseTime': '2025-08-27T13:46:51Z',
111+
'version': '2.17.1',
112+
'releaseTime': '2025-09-10T08:30:42Z',
113113
'institution': '${BIRDHOUSE_INSTITUTION}',
114114
'researchSubject': '${BIRDHOUSE_SUBJECT}',
115115
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
141141
# NOTE:
142142
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
143143
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
144-
'version': '2.16.12',
145-
'releaseTime': '2025-08-27T13:46:51Z',
144+
'version': '2.17.1',
145+
'releaseTime': '2025-09-10T08:30:42Z',
146146
'institution': '${BIRDHOUSE_INSTITUTION}',
147147
'researchSubject': '${BIRDHOUSE_SUBJECT}',
148148
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

‎birdhouse/components/finch/default.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# must use single quotes to avoid early expansion before overrides in env.local
55
# are applied and must be added to the list of DELAYED_EVAL.
66

7-
export FINCH_VERSION=0.9.2
7+
export FINCH_VERSION=0.12.1
88
export FINCH_DOCKER=birdhouse/finch
99
export FINCH_IMAGE='${FINCH_DOCKER}:version-${FINCH_VERSION}'
1010
export FINCH_IMAGE_URI='registry.hub.docker.com/${FINCH_IMAGE}'

‎birdhouse/components/stac/backup‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ backup_representative() {
2020
# This may cause errors in the future if new log levels are introduced.
2121
# It is assumed for the moment that equivalent log level are desired between the populator and the CLI
2222
# when debugging the entire birdhouse backup process, or that ERROR/WARN/INFO are used otherwise.
23+
log INFO "Starting STAC populator [${STAC_POPULATOR_BACKUP_IMAGE}] for representative backup of STAC JSON data"
2324
docker run --rm \
2425
--network "${COMPOSE_PROJECT_NAME}_default" \
2526
-v ${BIRDHOUSE_BACKUP_VOLUME}:/backup \
@@ -34,16 +35,17 @@ backup_representative() {
3435

3536
restore_representative() {
3637
_do_restore() {
37-
${BIRDHOUSE_EXE} --quiet compose rm -f stac-db
38+
${BIRDHOUSE_EXE} --quiet compose rm -f stac-db stac-migration
3839
docker volume rm "${COMPOSE_PROJECT_NAME}_stac-db"
3940
${BIRDHOUSE_EXE} --quiet compose create stac-db
40-
${BIRDHOUSE_EXE} --quiet compose start stac-db stac
41+
${BIRDHOUSE_EXE} --quiet compose start stac-db stac-migration stac
4142
count=0
4243
while [ "$(docker inspect --format='{{.State.Health.Status}}' stac)" != "healthy" ]; do
4344
[ "$count" -gt 5 ] && log ERROR "stac service is not healthy after 10 seconds" && return 1
4445
sleep 2
4546
count="$(( $count + 1 ))"
4647
done
48+
log INFO "Starting STAC populator [${STAC_POPULATOR_BACKUP_IMAGE}] for representative restore of STAC JSON data"
4749
docker run --rm \
4850
--network "${COMPOSE_PROJECT_NAME}_default" \
4951
-v ${BIRDHOUSE_BACKUP_VOLUME}:/backup \

0 commit comments

Comments
 (0)