From a18fa36a0c9b6dbb29dd0f73db77d1d6b25dfb39 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Thu, 6 Feb 2025 10:29:40 -0500 Subject: [PATCH] =?UTF-8?q?Bump=20version:=206.1.1=20=E2=86=92=206.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .zenodo.json | 4 ++-- CHANGES.rst | 13 +++++++++++++ CITATION.cff | 4 ++-- Makefile | 2 +- README.rst | 20 ++++++++++---------- docker/Dockerfile-base | 2 +- setup.cfg | 2 +- weaver/__meta__.py | 2 +- 8 files changed, 31 insertions(+), 18 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index ae2728fb1..64726e3c5 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,8 +1,8 @@ { "upload_type": "software", - "title": "crim-ca/weaver:6.1.1", + "title": "crim-ca/weaver:6.2.0", "description": "Weaver: Workflow Execution Management Service (EMS); Application, Deployment and Execution Service (ADES); OGC API - Processes; WPS; CWL Application Package", - "version": "6.1.1", + "version": "6.2.0", "creators": [ { "name": "Charette-Migneault, Francis", diff --git a/CHANGES.rst b/CHANGES.rst index ed9f15b68..6fd7bb8e9 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,6 +10,19 @@ Changes `Unreleased `_ (latest) ======================================================================== +Changes: +-------- +- No change. + +Fixes: +------ +- No change. + +.. _changes_6.2.0: + +`6.2.0 `_ (2025-02-06) +======================================================================== + Changes: -------- - Replace ``succeeded`` status by ``successful`` everywhere where applicable (as originally defined by OGC API v1), diff --git a/CITATION.cff b/CITATION.cff index 046c21b04..17fd686fd 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,10 +1,10 @@ cff-version: 1.2.0 -title: "crim-ca/weaver:6.1.1" +title: "crim-ca/weaver:6.2.0" message: | Weaver: Workflow Execution Management Service (EMS); Application, Deployment and Execution Service (ADES); OGC API - Processes; WPS; CWL Application Package -version: "6.1.1" +version: "6.2.0" authors: - name: &crim Computer Research Institute of Montréal diff --git a/Makefile b/Makefile index 3abd8d86f..407268c6f 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ MAKEFILE_NAME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) # Application APP_ROOT := $(abspath $(lastword $(MAKEFILE_NAME))/..) APP_NAME := $(shell basename $(APP_ROOT)) -APP_VERSION ?= 6.1.1 +APP_VERSION ?= 6.2.0 APP_INI ?= $(APP_ROOT)/config/$(APP_NAME).ini DOCKER_REPO ?= pavics/weaver #DOCKER_REPO ?= docker-registry.crim.ca/ogc/weaver diff --git a/README.rst b/README.rst index 98dc3f7d3..f0d2d998c 100644 --- a/README.rst +++ b/README.rst @@ -58,13 +58,13 @@ for each process. :alt: Requires Python 3.9+ :target: https://www.python.org/getit -.. |commits-since| image:: https://img.shields.io/github/commits-since/crim-ca/weaver/6.1.1.svg?logo=github +.. |commits-since| image:: https://img.shields.io/github/commits-since/crim-ca/weaver/6.2.0.svg?logo=github :alt: Commits since latest release - :target: https://github.com/crim-ca/weaver/compare/6.1.1...master + :target: https://github.com/crim-ca/weaver/compare/6.2.0...master -.. |version| image:: https://img.shields.io/badge/latest%20version-6.1.1-blue?logo=github +.. |version| image:: https://img.shields.io/badge/latest%20version-6.2.0-blue?logo=github :alt: Latest Tagged Version - :target: https://github.com/crim-ca/weaver/tree/6.1.1 + :target: https://github.com/crim-ca/weaver/tree/6.2.0 .. |deps| image:: https://img.shields.io/librariesio/github/crim-ca/weaver?logo=librariesdotio&logoColor=white :alt: Libraries.io Dependencies Status @@ -78,9 +78,9 @@ for each process. :alt: Github Actions CI Build Status (master branch) :target: https://github.com/crim-ca/weaver/actions?query=workflow%3ATests+branch%3Amaster -.. |github_tagged| image:: https://img.shields.io/github/actions/workflow/status/crim-ca/weaver/tests.yml?label=6.1.1&branch=6.1.1&logo=github +.. |github_tagged| image:: https://img.shields.io/github/actions/workflow/status/crim-ca/weaver/tests.yml?label=6.2.0&branch=6.2.0&logo=github :alt: Github Actions CI Build Status (latest tag) - :target: https://github.com/crim-ca/weaver/actions?query=workflow%3ATests+branch%3A6.1.1 + :target: https://github.com/crim-ca/weaver/actions?query=workflow%3ATests+branch%3A6.2.0 .. |readthedocs| image:: https://img.shields.io/readthedocs/pavics-weaver?logo=readthedocs :alt: ReadTheDocs Build Status (master branch) @@ -92,7 +92,7 @@ for each process. .. below shield will either indicate the targeted version or 'tag not found' .. since docker tags are pushed following manual builds by CI, they are not automatic and no build artifact exists -.. |docker_build_status| image:: https://img.shields.io/docker/v/pavics/weaver/6.1.1?label=tag&logo=docker +.. |docker_build_status| image:: https://img.shields.io/docker/v/pavics/weaver/6.2.0?label=tag&logo=docker :alt: Docker Build Status (latest version) :target: https://hub.docker.com/r/pavics/weaver/tags @@ -276,12 +276,12 @@ For a prebuilt image, pull as follows: .. code-block:: shell - docker pull pavics/weaver:6.1.1 + docker pull pavics/weaver:6.2.0 For convenience, following tags are also available: -- ``weaver:6.1.1-manager``: `Weaver` image that will run the API for WPS process and job management. -- ``weaver:6.1.1-worker``: `Weaver` image that will run the process job runner application. +- ``weaver:6.2.0-manager``: `Weaver` image that will run the API for WPS process and job management. +- ``weaver:6.2.0-worker``: `Weaver` image that will run the process job runner application. Following links correspond to existing servers with `Weaver` configured as *EMS* or *ADES* instances respectively. diff --git a/docker/Dockerfile-base b/docker/Dockerfile-base index 8d5a2d731..ba2753da7 100644 --- a/docker/Dockerfile-base +++ b/docker/Dockerfile-base @@ -3,7 +3,7 @@ LABEL description.short="Weaver Base" LABEL description.long="Workflow Execution Management Service (EMS); Application, Deployment and Execution Service (ADES)" LABEL maintainer="Francis Charette-Migneault " LABEL vendor="CRIM" -LABEL version="6.1.1" +LABEL version="6.2.0" # setup paths ENV APP_DIR=/opt/local/src/weaver diff --git a/setup.cfg b/setup.cfg index 8f2a4cd0a..2aa116cb0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 6.1.1 +current_version = 6.2.0 commit = True tag = True tag_name = {new_version} diff --git a/weaver/__meta__.py b/weaver/__meta__.py index 1704e5e5b..bd552fa16 100644 --- a/weaver/__meta__.py +++ b/weaver/__meta__.py @@ -1,6 +1,6 @@ __name__ = "weaver" __title__ = "Weaver" -__version__ = "6.1.1" +__version__ = "6.2.0" __description__ = "Workflow Execution Management Service (EMS); Application, Deployment and Execution Service (ADES)." __source_repository__ = "https://github.com/crim-ca/weaver" __docker_repository__ = "https://hub.docker.com/r/pavics/weaver"