diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 97ca9eac..a3ad6daf 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.2 +current_version = 2.0.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} 2023-12-15T17:42:58Z +search = {current_version} 2024-01-16T21:24:38Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-12-15T17:42:58Z +values = 2024-01-16T21:24:38Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index b6682271..4c131fc6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,16 @@ [//]: # (list changes here, using '-' for each new entry, remove this when items are added) +[2.0.3](https://github.com/bird-house/birdhouse-deploy/tree/2.0.3) (2024-01-16) +------------------------------------------------------------------------------------------------------------------ + +## Fixes + +- Autodeploy broken due to instanciated left-over files in ./config/ dir + + The `.gitignore` syntax was wrong. Regression from v2.0.0. + + [2.0.2](https://github.com/bird-house/birdhouse-deploy/tree/2.0.2) (2023-12-15) ------------------------------------------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index 4bc5d908..0c29a0b6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.0.2 +override APP_VERSION := 2.0.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 b3290151..cd1c2ef7 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/2.0.2.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.0.3.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.0.2...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.0.3...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.0.2-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.0.3-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.0.2 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.0.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 fe467292..4a740c13 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.0.2 2023-12-15T17:42:58Z +2.0.3 2024-01-16T21:24:38Z diff --git a/birdhouse/.gitignore b/birdhouse/.gitignore index f6a2dff5..5b8a7b86 100644 --- a/birdhouse/.gitignore +++ b/birdhouse/.gitignore @@ -1 +1 @@ -./config +/config/ diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index 925f465f..8e8cd645 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/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': '2.0.2', - 'releaseTime': '2023-12-15T17:42:58Z', + 'version': '2.0.3', + 'releaseTime': '2024-01-16T21:24:38Z', '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': '2.0.2', - 'releaseTime': '2023-12-15T17:42:58Z', + 'version': '2.0.3', + 'releaseTime': '2024-01-16T21:24:38Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 7318b5cd..dd79187a 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.0.2' +version = '2.0.3' # The full version, including alpha/beta/rc tags. -release = '2.0.2' +release = '2.0.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.