Skip to content

Commit

Permalink
deprecate flyingpigeon (#376)
Browse files Browse the repository at this point in the history
## Overview

Deprecate the `flyingpigeon` web processing service

## Changes

**Non-breaking changes**
- Removes flyingpigeon from the `DEFAULT_CONF_DIRS` list and moves its
config files to the `deprecated-components` directory

**Breaking changes**
- If a deployment uses flyingpigeon they will need to specify it in the
`EXTRA_CONF_DIRS` list

## Related Issue / Discussion

## Additional Information

Links to other issues or sources.

- Ouranosinc/pavics-sdi#296
- Ouranosinc/pavics-sdi#275
- Fixes #375
  • Loading branch information
mishaschwartz authored Sep 13, 2023
2 parents c510646 + e2a6d59 commit 6be0107
Show file tree
Hide file tree
Showing 23 changed files with 37 additions and 35 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.30.1
current_version = 1.31.0
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-11T15:55:37Z
search = {current_version} 2023-09-13T15:40:14Z
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}

[bumpversion:part:releaseTime]
values = 2023-09-11T15:55:37Z
values = 2023-09-13T15:40:14Z

[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.0](https://github.com/bird-house/birdhouse-deploy/tree/1.31.0) (2023-09-13)
------------------------------------------------------------------------------------------------------------------

## Changes:

- Deprecate the `flyingpigeon` web processing service.
The service can be enabled using [`deprecated-components/flyingpigeon`](birdhouse/deprecated-components/flyingpigeon) in `EXTRA_CONF_DIRS`.

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

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.30.1
override APP_VERSION := 1.31.0

# 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.30.1.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.31.0.svg
:alt: Commits since latest release
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.30.1...master
:target: https://github.com/bird-house/birdhouse-deploy/compare/1.31.0...master

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

.. |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.30.1 2023-09-11T15:55:37Z
1.31.0 2023-09-13T15:40:14Z
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.30.1',
'releaseTime': '2023-09-11T15:55:37Z',
'version': '1.31.0',
'releaseTime': '2023-09-13T15:40:14Z',
'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.30.1',
'releaseTime': '2023-09-11T15:55:37Z',
'version': '1.31.0',
'releaseTime': '2023-09-13T15:40:14Z',
'institution': 'Ouranos',
'researchSubject': 'Climatology',
'supportEmail': '${SUPPORT_EMAIL}',
Expand Down

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion birdhouse/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export DEFAULT_CONF_DIRS='
./config/proxy
./config/canarie-api
./config/geoserver
./config/flyingpigeon
./config/finch
./config/raven
./config/hummingbird
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: "3.4"
services:
proxy:
volumes:
- ./deprecated-components/flyingpigeon/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/flyingpigeon_canarie_api_monitoring.py:ro
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: "3.4"
services:
magpie:
volumes:
- ./deprecated-components/flyingpigeon/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/flyingpigeon-providers.cfg:ro
- ./deprecated-components/flyingpigeon/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/flyingpigeon-permissions.cfg:ro
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
environment:
- PYWPS_CFG=/wps.cfg
volumes:
- ./config/flyingpigeon/wps.cfg:/wps.cfg
- ./deprecated-components/flyingpigeon/wps.cfg:/wps.cfg
- /tmp
depends_on:
- postgres
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.30.1'
version = '1.31.0'
# The full version, including alpha/beta/rc tags.
release = '1.30.1'
release = '1.31.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
9 changes: 2 additions & 7 deletions tests/test_read_configs_include.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ class TestReadConfigs:
"./config/proxy",
"./config/canarie-api",
"./config/geoserver",
"./config/postgres",
"./config/wps_outputs-volume",
"./config/flyingpigeon",
"./config/postgres",
"./config/finch",
"./config/raven",
"./config/data-volume",
Expand Down Expand Up @@ -177,13 +176,10 @@ class TestCreateComposeConfList:
"./config/geoserver/docker-compose-extra.yml",
"./config/geoserver/config/canarie-api/docker-compose-extra.yml",
"./config/geoserver/config/proxy/docker-compose-extra.yml",
"./config/postgres/docker-compose-extra.yml",
"./config/wps_outputs-volume/docker-compose-extra.yml",
"./config/wps_outputs-volume/config/canarie-api/docker-compose-extra.yml",
"./config/wps_outputs-volume/config/proxy/docker-compose-extra.yml",
"./config/flyingpigeon/docker-compose-extra.yml",
"./config/flyingpigeon/config/canarie-api/docker-compose-extra.yml",
"./config/flyingpigeon/config/wps_outputs-volume/docker-compose-extra.yml",
"./config/postgres/docker-compose-extra.yml",
"./config/finch/docker-compose-extra.yml",
"./config/finch/config/canarie-api/docker-compose-extra.yml",
"./config/finch/config/wps_outputs-volume/docker-compose-extra.yml",
Expand All @@ -202,7 +198,6 @@ class TestCreateComposeConfList:
"./config/portainer/config/proxy/docker-compose-extra.yml",
"./config/magpie/docker-compose-extra.yml",
"./config/geoserver/config/magpie/docker-compose-extra.yml",
"./config/flyingpigeon/config/magpie/docker-compose-extra.yml",
"./config/finch/config/magpie/docker-compose-extra.yml",
"./config/raven/config/magpie/docker-compose-extra.yml",
"./config/hummingbird/config/magpie/docker-compose-extra.yml",
Expand Down

0 comments on commit 6be0107

Please sign in to comment.