From 59929670f4b81397a72e73497ef5de51aaa1cc73 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Tue, 23 Jul 2024 17:40:41 -0400 Subject: [PATCH 1/2] update Magpie==4.1.1 and Twitcher==0.10.0 --- CHANGES.md | 9 ++++++++- birdhouse/components/magpie/default.env | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 47b10f1df..5c8ff6a4a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,14 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## 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)). [2.5.2](https://github.com/bird-house/birdhouse-deploy/tree/2.5.2) (2024-07-19) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/components/magpie/default.env b/birdhouse/components/magpie/default.env index 6fe22de40..2ce3dd1fc 100644 --- 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" From e40e990dcd8d2da0ff236278c3e79ef407e4b27d Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Wed, 11 Sep 2024 18:57:09 -0400 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=202.5.2=20=E2=86=92=202.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 +++++ Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c97bfc5b2..16fd47ca3 100644 --- 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 index aa30e6139..a83d33ec9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,11 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ +[//]: # (list changes here, using '-' for each new entry, remove this when items are added) + +[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 diff --git a/Makefile b/Makefile index 1b79f8562..190c95210 100644 --- 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 index 3cb2890cc..e0924ff64 100644 --- 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 index 57f37a7db..17a7e48f6 100644 --- 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 index e30c9c969..b6eef6344 100644 --- 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/docs/source/conf.py b/docs/source/conf.py index 46859be7f..5010e4422 100644 --- 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.