diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b9d85e11..2bac4e00 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.5.5 +current_version = 2.6.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} 2024-11-14T21:04:17Z +search = {current_version} 2024-11-19T13:53:14Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-11-14T21:04:17Z +values = 2024-11-19T13:53:14Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 97e04940..b2088001 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.6.0](https://github.com/bird-house/birdhouse-deploy/tree/2.6.0) (2024-11-19) +------------------------------------------------------------------------------------------------------------------ + ## Changes - Add the `prometheus-log-parser` optional component diff --git a/Makefile b/Makefile index 085051c8..178116bd 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.5.5 +override APP_VERSION := 2.6.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 e291e85d..3d0a9963 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.5.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.0.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.5...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.0...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.5-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.0-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.5 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.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 26d8c76b..9200ea1c 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.5.5 2024-11-14T21:04:17Z +2.6.0 2024-11-19T13:53:14Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index c0a3248e..fc82b7d3 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.5', - 'releaseTime': '2024-11-14T21:04:17Z', + 'version': '2.6.0', + 'releaseTime': '2024-11-19T13:53:14Z', '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.5', - 'releaseTime': '2024-11-14T21:04:17Z', + 'version': '2.6.0', + 'releaseTime': '2024-11-19T13:53:14Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index b484a165..a6e0fba8 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.5' +version = '2.6.0' # The full version, including alpha/beta/rc tags. -release = '2.5.5' +release = '2.6.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.