Skip to content

Commit

Permalink
add flyingpigeon to birdhouse/config .gitignore since moved to deprec…
Browse files Browse the repository at this point in the history
…ated-components (#380)

## Overview

Avoid git dirty working directory from deprecated flyingpigeon configurations generated from templates that could remain.
Ignore template files causing a problem after #376 update.

## Changes

**Non-breaking changes**
- Fix invalid templated configurations of `flyingpigeon` that could remain in the old 
  location (`birdhouse/config/flyingpigeon`) when updating an existing instance to `1.31.0`.
 

**Breaking changes**
- n/a

## Related Issue / Discussion

- Resolves #376 (comment)
  • Loading branch information
fmigneault authored Sep 13, 2023
2 parents e4789b9 + adba0e6 commit f2f64c9
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.31.1
current_version = 1.31.2
commit = True
tag = False
tag_name = {new_version}
Expand Down Expand Up @@ -30,11 +30,11 @@ search = {current_version}
replace = {new_version}

[bumpversion:file:RELEASE.txt]
search = {current_version} 2023-09-13T17:50:55Z
search = {current_version} 2023-09-13T18:07:31Z
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}

[bumpversion:part:releaseTime]
values = 2023-09-13T17:50:55Z
values = 2023-09-13T18:07:31Z

[bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
search = 'version': '{current_version}'
Expand Down
8 changes: 8 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)

[1.31.2](https://github.com/bird-house/birdhouse-deploy/tree/1.31.2) (2023-09-13)
------------------------------------------------------------------------------------------------------------------

## Fixes

- Fix invalid templated configurations of `flyingpigeon` that could remain in the old
location (`birdhouse/config/flyingpigeon`) when updating an existing instance to `1.31.0`.

[1.31.1](https://github.com/bird-house/birdhouse-deploy/tree/1.31.1) (2023-09-13)
------------------------------------------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generic variables
override SHELL := bash
override APP_NAME := birdhouse-deploy
override APP_VERSION := 1.31.1
override APP_VERSION := 1.31.2

# utility to remove comments after value of an option variable
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.31.1.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.31.2.svg
:alt: Commits since latest release
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.31.1...master
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.31.2...master

.. |latest-version| image:: https://img.shields.io/badge/tag-1.31.1-blue.svg?style=flat
.. |latest-version| image:: https://img.shields.io/badge/tag-1.31.2-blue.svg?style=flat
:alt: Latest Tag
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.31.1
:target: https://github.com/bird-house/birdhouse-deploy/tree/1.31.2

.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
:alt: ReadTheDocs Build Status (latest version)
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.31.1 2023-09-13T17:50:55Z
1.31.2 2023-09-13T18:07:31Z
2 changes: 2 additions & 0 deletions birdhouse/config/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ ncwms2/
project-api/
solr/
phoenix/
# moved to deprecated-components
flyingpigeon/
8 changes: 4 additions & 4 deletions birdhouse/config/canarie-api/docker_configuration.py.template
Original file line number Diff line number Diff line change
Expand Up @@ -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.31.1',
'releaseTime': '2023-09-13T17:50:55Z',
'version': '1.31.2',
'releaseTime': '2023-09-13T18:07:31Z',
'institution': 'Ouranos',
'researchSubject': 'Climatology',
'supportEmail': '${SUPPORT_EMAIL}',
Expand Down Expand Up @@ -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.31.1',
'releaseTime': '2023-09-13T17:50:55Z',
'version': '1.31.2',
'releaseTime': '2023-09-13T18:07:31Z',
'institution': 'Ouranos',
'researchSubject': 'Climatology',
'supportEmail': '${SUPPORT_EMAIL}',
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
# built documents.
#
# The short X.Y version.
version = '1.31.1'
version = '1.31.2'
# The full version, including alpha/beta/rc tags.
release = '1.31.1'
release = '1.31.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit f2f64c9

Please sign in to comment.