Merge remote-tracking branch 'origin/master' into update-thredds-5.4

bird-house · Sep 17, 2024 · 8df5da1 · 8df5da1
2 parents 70b5fe0 + fd1a4b9
commit 8df5da1
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 19 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.5.2
+current_version = 2.5.3
 commit = True
 tag = False
 tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
 replace = {new_version}
 
 [bumpversion:file:RELEASE.txt]
-search = {current_version} 2024-07-19T03:04:07Z
+search = {current_version} 2024-09-11T22:57:09Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2024-07-19T03:04:07Z
+values = 2024-09-11T22:57:09Z
 
 [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

diff --git a/CHANGES.md b/CHANGES.md
@@ -21,6 +21,19 @@
 
   Unidata has dropped support for TDS versions < 5.x. This updates Thredds to version 5.5.
 
+
+[2.5.3](https://github.com/bird-house/birdhouse-deploy/tree/2.5.3) (2024-09-11)
+------------------------------------------------------------------------------------------------------------------
+
+## Changes
+
+- Magpie/Twitcher: update Python packages and base Docker image to address security vulnerabilities 
+
+  - [Magpie 4.1.1](https://github.com/Ouranosinc/Magpie/blob/master/CHANGES.rst#411-2024-07-23)
+    (relates to [Ouranosinc/Magpie#622](https://github.com/Ouranosinc/Magpie/pull/622)).
+  - [Twitcher 0.10.0](https://github.com/bird-house/twitcher/blob/master/CHANGES.rst#0100-2024-07-22)
+    (relates to [bird-house/twitcher#136](https://github.com/bird-house/twitcher/pull/136)).
+
 - xclim-testdata: adapt repository cloning script to the new data structure
 
   The `xclim-testdata` repo has been restructured to include the data in a `data` subdirectory.

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -37,9 +37,9 @@ Policy rules
 
 3. Contributions will trigger a test suite that must successfully pass before being merged (or integrated).
 
-    * The test suite can be run using a different DACCS config with ``birdhouse_daccs_configs_branch: branch_name`` in the PR description.
-    * It is possible to skip the test suite if the latest commit contains either ``[skip ci]``, ``[ci skip]`` or ``[no ci]``.
-      To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci: true`` in the PR description.
+   * The test suite can be run using a different DACCS config with ``birdhouse_daccs_configs_branch: {branch_name}`` in the PR description.
+   * To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci: true`` in the PR description.
+   * It is possible to skip the test suite if the latest commit message contains ``[skip ci]``.
 
 4. Contributions must be reviewed by every willing organizations
    (Default reviewers are `@mishaschwartz`_ for `UofT` , `@tlvu`_ for `Ouranos`_ and `@fmigneault`_ for `CRIM`_).

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 2.5.2
+override APP_VERSION := 2.5.3
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

diff --git a/README.rst b/README.rst
@@ -18,13 +18,13 @@ for a full-fledged production platform.
     * - citation
       - | |citation|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.5.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.5.3.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.2...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.3...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.2-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.3-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.2
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.3
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

diff --git a/RELEASE.txt b/RELEASE.txt
@@ -1 +1 @@
-2.5.2 2024-07-19T03:04:07Z
+2.5.3 2024-09-11T22:57:09Z
diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template
@@ -108,8 +108,8 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.5.2',
-            'releaseTime': '2024-07-19T03:04:07Z',
+            'version': '2.5.3',
+            'releaseTime': '2024-09-11T22:57:09Z',
             'institution': '${BIRDHOUSE_INSTITUTION}',
             'researchSubject': '${BIRDHOUSE_SUBJECT}',
             'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.5.2',
-            'releaseTime': '2024-07-19T03:04:07Z',
+            'version': '2.5.3',
+            'releaseTime': '2024-09-11T22:57:09Z',
             'institution': '${BIRDHOUSE_INSTITUTION}',
             'researchSubject': '${BIRDHOUSE_SUBJECT}',
             'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

diff --git a/birdhouse/components/magpie/default.env b/birdhouse/components/magpie/default.env
@@ -5,7 +5,7 @@
 # are applied and must be added to the list of DELAYED_EVAL.
 
 # Tag version that will be used to update Magpie API, Magpie CLI, and matching Twitcher with Magpie Adapter
-export MAGPIE_VERSION=3.38.0
+export MAGPIE_VERSION=4.1.1
 
 export MAGPIE_DB_NAME="magpiedb"
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.5.2'
+version = '2.5.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.5.2'
+release = '2.5.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.