diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 93889c519..50dcd4514 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.30.1 +current_version = 1.31.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-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}' diff --git a/CHANGES.md b/CHANGES.md index 93af15f34..9fbba1ec1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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) ------------------------------------------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index ac87de67f..cbc20f76f 100644 --- a/Makefile +++ b/Makefile @@ -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") diff --git a/README.rst b/README.rst index 69d8df5e1..4a960fb92 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.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) diff --git a/RELEASE.txt b/RELEASE.txt index c1228420e..dbd01c8ca 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.30.1 2023-09-11T15:55:37Z +1.31.0 2023-09-13T15:40:14Z diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index 40b9e86d8..4ac582996 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.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}', @@ -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}', diff --git a/birdhouse/config/flyingpigeon/config/canarie-api/docker-compose-extra.yml b/birdhouse/config/flyingpigeon/config/canarie-api/docker-compose-extra.yml deleted file mode 100644 index 1f45a13be..000000000 --- a/birdhouse/config/flyingpigeon/config/canarie-api/docker-compose-extra.yml +++ /dev/null @@ -1,5 +0,0 @@ -version: "3.4" -services: - proxy: - volumes: - - ./config/flyingpigeon/config/canarie-api/canarie_api_monitoring.py:${CANARIE_MONITORING_EXTRA_CONF_DIR}/flyingpigeon_canarie_api_monitoring.py:ro diff --git a/birdhouse/config/flyingpigeon/config/magpie/docker-compose-extra.yml b/birdhouse/config/flyingpigeon/config/magpie/docker-compose-extra.yml deleted file mode 100644 index 5c1624cf7..000000000 --- a/birdhouse/config/flyingpigeon/config/magpie/docker-compose-extra.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: "3.4" -services: - magpie: - volumes: - - ./config/flyingpigeon/config/magpie/providers.cfg:${MAGPIE_PROVIDERS_CONFIG_PATH}/flyingpigeon-providers.cfg:ro - - ./config/flyingpigeon/config/magpie/permissions.cfg:${MAGPIE_PERMISSIONS_CONFIG_PATH}/flyingpigeon-permissions.cfg:ro diff --git a/birdhouse/default.env b/birdhouse/default.env index 6fd3456ae..f5f082d03 100644 --- a/birdhouse/default.env +++ b/birdhouse/default.env @@ -40,7 +40,6 @@ export DEFAULT_CONF_DIRS=' ./config/proxy ./config/canarie-api ./config/geoserver - ./config/flyingpigeon ./config/finch ./config/raven ./config/hummingbird diff --git a/birdhouse/config/flyingpigeon/.gitignore b/birdhouse/deprecated-components/flyingpigeon/.gitignore similarity index 100% rename from birdhouse/config/flyingpigeon/.gitignore rename to birdhouse/deprecated-components/flyingpigeon/.gitignore diff --git a/birdhouse/config/flyingpigeon/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/deprecated-components/flyingpigeon/config/canarie-api/canarie_api_monitoring.py.template similarity index 100% rename from birdhouse/config/flyingpigeon/config/canarie-api/canarie_api_monitoring.py.template rename to birdhouse/deprecated-components/flyingpigeon/config/canarie-api/canarie_api_monitoring.py.template diff --git a/birdhouse/deprecated-components/flyingpigeon/config/canarie-api/docker-compose-extra.yml b/birdhouse/deprecated-components/flyingpigeon/config/canarie-api/docker-compose-extra.yml new file mode 100644 index 000000000..89a66084f --- /dev/null +++ b/birdhouse/deprecated-components/flyingpigeon/config/canarie-api/docker-compose-extra.yml @@ -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 diff --git a/birdhouse/deprecated-components/flyingpigeon/config/magpie/docker-compose-extra.yml b/birdhouse/deprecated-components/flyingpigeon/config/magpie/docker-compose-extra.yml new file mode 100644 index 000000000..549865715 --- /dev/null +++ b/birdhouse/deprecated-components/flyingpigeon/config/magpie/docker-compose-extra.yml @@ -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 diff --git a/birdhouse/config/flyingpigeon/config/magpie/permissions.cfg.template b/birdhouse/deprecated-components/flyingpigeon/config/magpie/permissions.cfg.template similarity index 100% rename from birdhouse/config/flyingpigeon/config/magpie/permissions.cfg.template rename to birdhouse/deprecated-components/flyingpigeon/config/magpie/permissions.cfg.template diff --git a/birdhouse/config/flyingpigeon/config/magpie/providers.cfg.template b/birdhouse/deprecated-components/flyingpigeon/config/magpie/providers.cfg.template similarity index 100% rename from birdhouse/config/flyingpigeon/config/magpie/providers.cfg.template rename to birdhouse/deprecated-components/flyingpigeon/config/magpie/providers.cfg.template diff --git a/birdhouse/config/flyingpigeon/config/wps_outputs-volume/docker-compose-extra.yml b/birdhouse/deprecated-components/flyingpigeon/config/wps_outputs-volume/docker-compose-extra.yml similarity index 100% rename from birdhouse/config/flyingpigeon/config/wps_outputs-volume/docker-compose-extra.yml rename to birdhouse/deprecated-components/flyingpigeon/config/wps_outputs-volume/docker-compose-extra.yml diff --git a/birdhouse/config/flyingpigeon/default.env b/birdhouse/deprecated-components/flyingpigeon/default.env similarity index 100% rename from birdhouse/config/flyingpigeon/default.env rename to birdhouse/deprecated-components/flyingpigeon/default.env diff --git a/birdhouse/config/flyingpigeon/docker-compose-extra.yml b/birdhouse/deprecated-components/flyingpigeon/docker-compose-extra.yml similarity index 86% rename from birdhouse/config/flyingpigeon/docker-compose-extra.yml rename to birdhouse/deprecated-components/flyingpigeon/docker-compose-extra.yml index a52ae388d..099f4952f 100644 --- a/birdhouse/config/flyingpigeon/docker-compose-extra.yml +++ b/birdhouse/deprecated-components/flyingpigeon/docker-compose-extra.yml @@ -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 diff --git a/birdhouse/config/flyingpigeon/post-docker-compose-up b/birdhouse/deprecated-components/flyingpigeon/post-docker-compose-up similarity index 100% rename from birdhouse/config/flyingpigeon/post-docker-compose-up rename to birdhouse/deprecated-components/flyingpigeon/post-docker-compose-up diff --git a/birdhouse/config/flyingpigeon/service-config.json.template b/birdhouse/deprecated-components/flyingpigeon/service-config.json.template similarity index 100% rename from birdhouse/config/flyingpigeon/service-config.json.template rename to birdhouse/deprecated-components/flyingpigeon/service-config.json.template diff --git a/birdhouse/config/flyingpigeon/wps.cfg.template b/birdhouse/deprecated-components/flyingpigeon/wps.cfg.template similarity index 100% rename from birdhouse/config/flyingpigeon/wps.cfg.template rename to birdhouse/deprecated-components/flyingpigeon/wps.cfg.template diff --git a/docs/source/conf.py b/docs/source/conf.py index 44fc35955..9d9d21268 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -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. diff --git a/tests/test_read_configs_include.py b/tests/test_read_configs_include.py index fcc01c78b..2943561e4 100644 --- a/tests/test_read_configs_include.py +++ b/tests/test_read_configs_include.py @@ -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", @@ -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", @@ -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",