From 39a87cf2988099992e9703c7d53eca1b8854a18c Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Thu, 7 May 2020 14:43:09 -0400 Subject: [PATCH] =?UTF-8?q?Bump=20version:=201.5.1=20=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.rst | 3 +++ Makefile | 2 +- README.rst | 16 ++++++++-------- docker/Dockerfile-base | 2 +- setup.cfg | 2 +- weaver/__meta__.py | 2 +- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 075ed283e..f0edcb860 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,9 @@ Changes `Unreleased `_ (latest) ======================================================================== +`1.6.0 `_ (2020-05-07) +======================================================================== + Changes: -------- diff --git a/Makefile b/Makefile index 2afabe9f2..120722ac9 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 ?= 1.5.1 +APP_VERSION ?= 1.6.0 APP_INI ?= $(APP_ROOT)/config/$(APP_NAME).ini DOCKER_REPO ?= docker-registry.crim.ca/ogc/weaver diff --git a/README.rst b/README.rst index e682e763d..16df9d6c1 100644 --- a/README.rst +++ b/README.rst @@ -38,13 +38,13 @@ For more details, see `Configuration`_ section. :alt: Requires Python 2.7, 3.6+ :target: https://www.python.org/getit -.. |commits-since| image:: https://img.shields.io/github/commits-since/crim-ca/weaver/1.5.1.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/crim-ca/weaver/1.6.0.svg :alt: Commits since latest release - :target: https://github.com/crim-ca/weaver/compare/1.5.1...master + :target: https://github.com/crim-ca/weaver/compare/1.6.0...master .. |version| image:: https://img.shields.io/github/tag/crim-ca/weaver.svg?style=flat :alt: Latest Tag - :target: https://github.com/crim-ca/weaver/tree/1.5.1 + :target: https://github.com/crim-ca/weaver/tree/1.6.0 .. |requires| image:: https://requires.io/github/crim-ca/weaver/requirements.svg?branch=master :alt: Requirements Status @@ -54,9 +54,9 @@ For more details, see `Configuration`_ section. :alt: Travis-CI Build Status (master branch) :target: https://travis-ci.com/crim-ca/weaver -.. |travis_tagged| image:: https://img.shields.io/travis/com/crim-ca/weaver/1.5.1.svg?label=1.5.1 +.. |travis_tagged| image:: https://img.shields.io/travis/com/crim-ca/weaver/1.6.0.svg?label=1.6.0 :alt: Travis-CI Build Status (latest tag) - :target: https://github.com/crim-ca/weaver/tree/1.5.1 + :target: https://github.com/crim-ca/weaver/tree/1.6.0 .. |readthedocs| image:: https://img.shields.io/readthedocs/pavics-weaver :alt: Readthedocs Build Status (master branch) @@ -105,12 +105,12 @@ Docker image repositories: :: - $ docker pull pavics/weaver:1.5.1 + $ docker pull pavics/weaver:1.6.0 For convenience, following tags are also available: -- ``weaver:1.5.1-manager``: `Weaver` image that will run the API for WPS process and job management. -- ``weaver:1.5.1-worker``: `Weaver` image that will run the process job runner application. +- ``weaver:1.6.0-manager``: `Weaver` image that will run the API for WPS process and job management. +- ``weaver:1.6.0-worker``: `Weaver` image that will run the process job runner application. Following links correspond to existing servers with `Weaver` configured as *EMS*/*ADES* instances respectively. diff --git a/docker/Dockerfile-base b/docker/Dockerfile-base index 235094985..2acc3b970 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="1.5.1" +LABEL version="1.6.0" # setup paths ENV APP_DIR=/opt/local/src/weaver diff --git a/setup.cfg b/setup.cfg index c09f95660..b04faa01b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.5.1 +current_version = 1.6.0 commit = True tag = True tag_name = {new_version} diff --git a/weaver/__meta__.py b/weaver/__meta__.py index 7948c8332..f9f0ea4f6 100644 --- a/weaver/__meta__.py +++ b/weaver/__meta__.py @@ -1,6 +1,6 @@ __name__ = "weaver" __title__ = "Weaver" -__version__ = "1.5.1" +__version__ = "1.6.0" __description__ = "Workflow Execution Management Service (EMS); Application, Deployment and Execution Service (ADES)." # __source_repository__ = "https://www.crim.ca/stash/projects/OGC/repos/weaver" # __docker_repository__ = "docker-registry.crim.ca/ogc/weaver:latest"