From b860247b420137a0e7bf06d69001d10187e71e41 Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:08:53 -0500 Subject: [PATCH 1/2] update cowbird to version 2.5.0 --- CHANGES.md | 7 ++++++- birdhouse/components/cowbird/default.env | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7be494e32..6b4f5cabf 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,12 @@ [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 + +- Updated Cowbird to version 2.5.0 + + This update fixes an issue where Magpie reports a webhook failure on almost every action. + See a full description of the issue in https://github.com/Ouranosinc/cowbird/pull/78. [2.7.0](https://github.com/bird-house/birdhouse-deploy/tree/2.7.0) (2024-12-19) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/components/cowbird/default.env b/birdhouse/components/cowbird/default.env index c559ab2ed..ba335cce3 100644 --- a/birdhouse/components/cowbird/default.env +++ b/birdhouse/components/cowbird/default.env @@ -29,7 +29,7 @@ VARS="$VARS $EXTRA_VARS" # Cowbird Configuration # ===================== -export COWBIRD_VERSION="2.4.0" +export COWBIRD_VERSION="2.5.0" # default release of the MongoDB version employed by Cowbird # note that MongoDB>=5.0 is REQUIRED for Cowbird>=2.0.0 From 708bee22c8e0f0aa4d2b8e36e8ad5a9a67ac7481 Mon Sep 17 00:00:00 2001 From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com> Date: Fri, 20 Dec 2024 09:08:42 -0500 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=202.7.0=20=E2=86=92=202.7.1?= 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 9b1d3f8d2..e10e38ad5 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.7.0 +current_version = 2.7.1 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-12-19T13:52:44Z +search = {current_version} 2024-12-20T14:08:42Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-12-19T13:52:44Z +values = 2024-12-20T14:08:42Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 6b4f5cabf..1cbceeac8 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.7.1](https://github.com/bird-house/birdhouse-deploy/tree/2.7.1) (2024-12-20) +------------------------------------------------------------------------------------------------------------------ + ## Changes - Updated Cowbird to version 2.5.0 diff --git a/Makefile b/Makefile index edfc59cc2..1426ca28b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.7.0 +override APP_VERSION := 2.7.1 # 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 32eafe845..a529b8469 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.7.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.7.1.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.7.0...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.7.1...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.7.0-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.7.1-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.7.0 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.7.1 .. |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 8f3a1ebae..18e4f579a 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.7.0 2024-12-19T13:52:44Z +2.7.1 2024-12-20T14:08:42Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index f937d7392..1045dec03 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.7.0', - 'releaseTime': '2024-12-19T13:52:44Z', + 'version': '2.7.1', + 'releaseTime': '2024-12-20T14:08:42Z', '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.7.0', - 'releaseTime': '2024-12-19T13:52:44Z', + 'version': '2.7.1', + 'releaseTime': '2024-12-20T14:08:42Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index ce5e655fb..aac6d8e1d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.7.0' +version = '2.7.1' # The full version, including alpha/beta/rc tags. -release = '2.7.0' +release = '2.7.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.