From 799e5f408fe6d7b62f5b5bc394d332f0a6847656 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Thu, 30 Nov 2023 16:59:01 +0000 Subject: [PATCH 1/5] Update cowbird version from 2.1.0 to 2.3.0 --- CHANGES.md | 5 ++++- birdhouse/components/cowbird/default.env | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 088fb34d..e47d75f3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,10 @@ [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 + +- Update `cowbird` service from [2.1.0](https://github.com/Ouranosinc/cowbird/tree/2.1.0) + to [2.3.0](https://github.com/Ouranosinc/cowbird/tree/2.3.0). [1.39.2](https://github.com/bird-house/birdhouse-deploy/tree/1.39.2) (2023-11-30) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/components/cowbird/default.env b/birdhouse/components/cowbird/default.env index 8100ddd8..18c2f213 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.1.0" +export COWBIRD_VERSION="2.3.0" # default release of the MongoDB version employed by Cowbird # note that MongoDB>=5.0 is REQUIRED for Cowbird>=2.0.0 From ffe6245da5605348c3b6d21a45b878a006d588a1 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Thu, 30 Nov 2023 19:27:02 +0000 Subject: [PATCH 2/5] =?UTF-8?q?Bump=20version:=201.40.0=20=E2=86=92=201.41?= =?UTF-8?q?.0?= 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 +- .../config/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 8e0b116f..4827f91e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.40.0 +current_version = 1.41.0 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} 2023-11-30T18:27:41Z +search = {current_version} 2023-11-30T19:27:02Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-11-30T18:27:41Z +values = 2023-11-30T19:27:02Z [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 76561f8c..6d932073 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) + +[1.41.0](https://github.com/bird-house/birdhouse-deploy/tree/1.41.0) (2023-11-30) +------------------------------------------------------------------------------------------------------------------ + ## Changes - Update `cowbird` service from [2.1.0](https://github.com/Ouranosinc/cowbird/tree/2.1.0) diff --git a/Makefile b/Makefile index c99dd108..4e0e686d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 1.40.0 +override APP_VERSION := 1.41.0 # 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 b62e91c9..92cf2961 100644 --- a/README.rst +++ b/README.rst @@ -14,13 +14,13 @@ for a full-fledged production platform. * - releases - | |latest-version| |commits-since| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.40.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.41.0.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.40.0...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.41.0...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.40.0-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.41.0-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.40.0 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.41.0 .. |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 30a3ae81..1f4f8e40 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.40.0 2023-11-30T18:27:41Z +1.41.0 2023-11-30T19:27:02Z diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index 1c658276..041f258e 100644 --- a/birdhouse/config/canarie-api/docker_configuration.py.template +++ b/birdhouse/config/canarie-api/docker_configuration.py.template @@ -109,8 +109,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': '1.40.0', - 'releaseTime': '2023-11-30T18:27:41Z', + 'version': '1.41.0', + 'releaseTime': '2023-11-30T19:27:02Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', @@ -142,8 +142,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': '1.40.0', - 'releaseTime': '2023-11-30T18:27:41Z', + 'version': '1.41.0', + 'releaseTime': '2023-11-30T19:27:02Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index c1bd76de..3a86ae93 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '1.40.0' +version = '1.41.0' # The full version, including alpha/beta/rc tags. -release = '1.40.0' +release = '1.41.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From a88cd3012afadaec66626d1006f3b4cf034b9167 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Thu, 30 Nov 2023 19:40:16 +0000 Subject: [PATCH 3/5] =?UTF-8?q?Revert=20"Bump=20version:=201.40.0=20?= =?UTF-8?q?=E2=86=92=201.41.0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ffe6245da5605348c3b6d21a45b878a006d588a1. --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 ----- Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../config/canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4827f91e..8e0b116f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.41.0 +current_version = 1.40.0 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} 2023-11-30T19:27:02Z +search = {current_version} 2023-11-30T18:27:41Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-11-30T19:27:02Z +values = 2023-11-30T18:27:41Z [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 6d932073..76561f8c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,11 +15,6 @@ [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) - -[1.41.0](https://github.com/bird-house/birdhouse-deploy/tree/1.41.0) (2023-11-30) ------------------------------------------------------------------------------------------------------------------- - ## Changes - Update `cowbird` service from [2.1.0](https://github.com/Ouranosinc/cowbird/tree/2.1.0) diff --git a/Makefile b/Makefile index 4e0e686d..c99dd108 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 1.41.0 +override APP_VERSION := 1.40.0 # 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 92cf2961..b62e91c9 100644 --- a/README.rst +++ b/README.rst @@ -14,13 +14,13 @@ for a full-fledged production platform. * - releases - | |latest-version| |commits-since| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.41.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.40.0.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.41.0...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.40.0...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.41.0-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.40.0-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.41.0 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.40.0 .. |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 1f4f8e40..30a3ae81 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.41.0 2023-11-30T19:27:02Z +1.40.0 2023-11-30T18:27:41Z diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index 041f258e..1c658276 100644 --- a/birdhouse/config/canarie-api/docker_configuration.py.template +++ b/birdhouse/config/canarie-api/docker_configuration.py.template @@ -109,8 +109,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': '1.41.0', - 'releaseTime': '2023-11-30T19:27:02Z', + 'version': '1.40.0', + 'releaseTime': '2023-11-30T18:27:41Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', @@ -142,8 +142,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': '1.41.0', - 'releaseTime': '2023-11-30T19:27:02Z', + 'version': '1.40.0', + 'releaseTime': '2023-11-30T18:27:41Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 3a86ae93..c1bd76de 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '1.41.0' +version = '1.40.0' # The full version, including alpha/beta/rc tags. -release = '1.41.0' +release = '1.40.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 47e97f4410bb54ed3bd33f8bc5926e6aa462810e Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Thu, 30 Nov 2023 19:44:44 +0000 Subject: [PATCH 4/5] Fixing bump of version --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 41a87a8b..a11dd953 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,7 +17,7 @@ ## Changes -- Update `cowbird` service from [2.1.0](https://github.com/Ouranosinc/cowbird/tree/2.1.0) +- Update `cowbird` service from [2.2.0](https://github.com/Ouranosinc/cowbird/tree/2.2.0) to [2.3.0](https://github.com/Ouranosinc/cowbird/tree/2.3.0). [1.41.0](https://github.com/bird-house/birdhouse-deploy/tree/1.41.0) (2023-11-30) From fe62012832463e113a166b6a203477e1a7e230a6 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Thu, 30 Nov 2023 19:44:57 +0000 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20version:=201.41.0=20=E2=86=92=201.42?= =?UTF-8?q?.0?= 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 +- .../config/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 45657ce0..9c9935db 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.41.0 +current_version = 1.42.0 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} 2023-11-30T19:26:27Z +search = {current_version} 2023-11-30T19:44:57Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-11-30T19:26:27Z +values = 2023-11-30T19:44:57Z [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index a11dd953..13dc6576 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) + +[1.42.0](https://github.com/bird-house/birdhouse-deploy/tree/1.42.0) (2023-11-30) +------------------------------------------------------------------------------------------------------------------ + ## Changes - Update `cowbird` service from [2.2.0](https://github.com/Ouranosinc/cowbird/tree/2.2.0) diff --git a/Makefile b/Makefile index 4e0e686d..7e8244f3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 1.41.0 +override APP_VERSION := 1.42.0 # 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 92cf2961..2b00ec48 100644 --- a/README.rst +++ b/README.rst @@ -14,13 +14,13 @@ for a full-fledged production platform. * - releases - | |latest-version| |commits-since| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.41.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.42.0.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.41.0...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.42.0...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.41.0-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.42.0-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.41.0 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.42.0 .. |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 bdab5ad8..1db622fc 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.41.0 2023-11-30T19:26:27Z +1.42.0 2023-11-30T19:44:57Z diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index f0cd9c4b..884a320e 100644 --- a/birdhouse/config/canarie-api/docker_configuration.py.template +++ b/birdhouse/config/canarie-api/docker_configuration.py.template @@ -109,8 +109,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': '1.41.0', - 'releaseTime': '2023-11-30T19:26:27Z', + 'version': '1.42.0', + 'releaseTime': '2023-11-30T19:44:57Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', @@ -142,8 +142,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': '1.41.0', - 'releaseTime': '2023-11-30T19:26:27Z', + 'version': '1.42.0', + 'releaseTime': '2023-11-30T19:44:57Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 3a86ae93..b8c9cdd3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '1.41.0' +version = '1.42.0' # The full version, including alpha/beta/rc tags. -release = '1.41.0' +release = '1.42.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.