From e2aa5337e32cd87efb5600f3fe62882d8d4d8b1f Mon Sep 17 00:00:00 2001 From: Francis Charette-Migneault Date: Thu, 30 Nov 2023 11:33:26 -0500 Subject: [PATCH] =?UTF-8?q?Bump=20version:=202.2.0=20=E2=86=92=202.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.rst | 5 +++++ Makefile | 2 +- README.rst | 24 ++++++++++++------------ cowbird/__meta__.py | 2 +- docker/Dockerfile-base | 2 +- setup.cfg | 2 +- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 9da29f4..a0b4651 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,11 @@ Changes `Unreleased `_ (latest) ------------------------------------------------------------------------------------ +* Nothing yet. + +`2.3.0 `_ (2023-11-30) +------------------------------------------------------------------------------------ + * Add optional key ``field`` and ``regex`` to be used in the ``sync_permissions`` section found in the config. This allows to sync permissions using a field other than ``resource_full_name`` when creating the ``name:type`` from the segment ``ex.: /field1::type1/field2::type2``. Adds support to use ``resource_display_name``. diff --git a/Makefile b/Makefile index adf47e0..31c3d8f 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ MAKEFILE_NAME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) # Application APP_ROOT := $(abspath $(lastword $(MAKEFILE_NAME))/..) APP_NAME := cowbird -APP_VERSION ?= 2.2.0 +APP_VERSION ?= 2.3.0 APP_INI ?= $(APP_ROOT)/config/$(APP_NAME).ini APP_PORT ?= 7000 diff --git a/README.rst b/README.rst index e3dbee8..1a293b4 100644 --- a/README.rst +++ b/README.rst @@ -44,13 +44,13 @@ the resources under those services such that the complete ecosystem can seamless :alt: Requires Python 3.7+ :target: https://www.python.org/getit -.. |commits-since| image:: https://img.shields.io/github/commits-since/Ouranosinc/cowbird/2.2.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/Ouranosinc/cowbird/2.3.0.svg :alt: Commits since latest release - :target: https://github.com/Ouranosinc/cowbird/compare/2.2.0...master + :target: https://github.com/Ouranosinc/cowbird/compare/2.3.0...master -.. |version| image:: https://img.shields.io/badge/tag-2.2.0-blue.svg?style=flat +.. |version| image:: https://img.shields.io/badge/tag-2.3.0-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/Ouranosinc/cowbird/tree/2.2.0 + :target: https://github.com/Ouranosinc/cowbird/tree/2.3.0 .. |dependencies| image:: https://pyup.io/repos/github/Ouranosinc/cowbird/shield.svg :alt: Dependencies Status @@ -60,9 +60,9 @@ the resources under those services such that the complete ecosystem can seamless :alt: Github Actions CI Build Status (master branch) :target: https://github.com/Ouranosinc/cowbird/actions?query=branch%3Amaster -.. |github_tagged| image:: https://img.shields.io/github/actions/workflow/status/Ouranosinc/cowbird/tests.yml?label=2.2.0&branch=2.2.0 +.. |github_tagged| image:: https://img.shields.io/github/actions/workflow/status/Ouranosinc/cowbird/tests.yml?label=2.3.0&branch=2.3.0 :alt: Github Actions CI Build Status (latest tag) - :target: https://github.com/Ouranosinc/cowbird/tree/2.2.0 + :target: https://github.com/Ouranosinc/cowbird/tree/2.3.0 .. |readthedocs| image:: https://img.shields.io/readthedocs/pavics-cowbird :alt: Readthedocs Build Status (master branch) @@ -134,12 +134,12 @@ Following most recent variants are available: - |cowbird_latest_websvc|_ -.. |cowbird_tag_base| replace:: pavics/cowbird:2.2.0 -.. _cowbird_tag_base: https://hub.docker.com/r/pavics/cowbird/tags?page=1&ordering=last_updated&name=2.2.0 -.. |cowbird_tag_worker| replace:: pavics/cowbird:2.2.0-worker -.. _cowbird_tag_worker: https://hub.docker.com/r/pavics/cowbird/tags?page=1&ordering=last_updated&name=2.2.0-worker -.. |cowbird_tag_websvc| replace:: pavics/cowbird:2.2.0-webservice -.. _cowbird_tag_websvc: https://hub.docker.com/r/pavics/cowbird/tags?page=1&ordering=last_updated&name=2.2.0-webservice +.. |cowbird_tag_base| replace:: pavics/cowbird:2.3.0 +.. _cowbird_tag_base: https://hub.docker.com/r/pavics/cowbird/tags?page=1&ordering=last_updated&name=2.3.0 +.. |cowbird_tag_worker| replace:: pavics/cowbird:2.3.0-worker +.. _cowbird_tag_worker: https://hub.docker.com/r/pavics/cowbird/tags?page=1&ordering=last_updated&name=2.3.0-worker +.. |cowbird_tag_websvc| replace:: pavics/cowbird:2.3.0-webservice +.. _cowbird_tag_websvc: https://hub.docker.com/r/pavics/cowbird/tags?page=1&ordering=last_updated&name=2.3.0-webservice .. |cowbird_latest_base| replace:: pavics/cowbird:latest .. _cowbird_latest_base: https://hub.docker.com/r/pavics/cowbird/tags?page=1&ordering=last_updated&name=latest diff --git a/cowbird/__meta__.py b/cowbird/__meta__.py index e65ac0d..4f00b8e 100644 --- a/cowbird/__meta__.py +++ b/cowbird/__meta__.py @@ -2,7 +2,7 @@ General meta information on the package. """ -__version__ = "2.2.0" +__version__ = "2.3.0" __title__ = "Cowbird" __package__ = "cowbird" # pylint: disable=W0622 __author__ = "Ouranos inc., CRIM" diff --git a/docker/Dockerfile-base b/docker/Dockerfile-base index de46900..e2b126a 100644 --- a/docker/Dockerfile-base +++ b/docker/Dockerfile-base @@ -3,7 +3,7 @@ LABEL description.short="Cowbird base" LABEL description.long="Cowbird middleware to manage interactions between various birds of the bird-house stack." LABEL Maintainer="Ouranos, CRIM" LABEL Vendor="Ouranos inc." -LABEL Version="2.2.0" +LABEL Version="2.3.0" ENV COWBIRD_DIR=/opt/local/src/cowbird ENV COWBIRD_CONFIG_DIR=${COWBIRD_DIR}/config diff --git a/setup.cfg b/setup.cfg index d279b68..712a272 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.2.0 +current_version = 2.3.0 commit = True tag = True tag_name = {new_version}