Skip to content

Commit

Permalink
Bump version: 4.17.0 → 4.18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fmigneault committed Jun 9, 2022
1 parent 9d51aa8 commit 3d32d24
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 31 deletions.
13 changes: 13 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@ Changes
`Unreleased <https://github.com/crim-ca/weaver/tree/master>`_ (latest)
========================================================================

Changes:
--------
- No change.

Fixes:
------
- No change.

.. _changes_4.18.0:

`4.18.0 <https://github.com/crim-ca/weaver/tree/4.18.0>`_ (2022-06-09)
========================================================================

Changes:
--------
- Add `CLI` *Authentication Handler* parameters and corresponding ``auth`` argument of instantiated classes for
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?= 4.17.0
APP_VERSION ?= 4.18.0
APP_INI ?= $(APP_ROOT)/config/$(APP_NAME).ini
DOCKER_REPO ?= pavics/weaver
#DOCKER_REPO ?= docker-registry.crim.ca/ogc/weaver
Expand Down
20 changes: 10 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ for each process.
:alt: Requires Python 3.6+
:target: https://www.python.org/getit

.. |commits-since| image:: https://img.shields.io/github/commits-since/crim-ca/weaver/4.17.0.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/crim-ca/weaver/4.18.0.svg
:alt: Commits since latest release
:target: https://github.com/crim-ca/weaver/compare/4.17.0...master
:target: https://github.com/crim-ca/weaver/compare/4.18.0...master

.. |version| image:: https://img.shields.io/badge/latest%20version-4.17.0-blue
.. |version| image:: https://img.shields.io/badge/latest%20version-4.18.0-blue
:alt: Latest Tagged Version
:target: https://github.com/crim-ca/weaver/tree/4.17.0
:target: https://github.com/crim-ca/weaver/tree/4.18.0

.. |requires| image:: https://requires.io/github/crim-ca/weaver/requirements.svg?branch=master
:alt: Requirements Status
Expand All @@ -62,9 +62,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/workflow/status/crim-ca/weaver/Tests/4.17.0?label=4.17.0
.. |github_tagged| image:: https://img.shields.io/github/workflow/status/crim-ca/weaver/Tests/4.18.0?label=4.18.0
:alt: Github Actions CI Build Status (latest tag)
:target: https://github.com/crim-ca/weaver/actions?query=workflow%3ATests+branch%3A4.17.0
:target: https://github.com/crim-ca/weaver/actions?query=workflow%3ATests+branch%3A4.18.0

.. |readthedocs| image:: https://img.shields.io/readthedocs/pavics-weaver
:alt: ReadTheDocs Build Status (master branch)
Expand All @@ -76,7 +76,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/4.17.0?label=tag%20status
.. |docker_build_status| image:: https://img.shields.io/docker/v/pavics/weaver/4.18.0?label=tag%20status
:alt: Docker Build Status (latest version)
:target: https://hub.docker.com/r/pavics/weaver/tags

Expand Down Expand Up @@ -199,12 +199,12 @@ Docker image repositories:

::

$ docker pull pavics/weaver:4.17.0
$ docker pull pavics/weaver:4.18.0

For convenience, following tags are also available:

- ``weaver:4.17.0-manager``: `Weaver` image that will run the API for WPS process and job management.
- ``weaver:4.17.0-worker``: `Weaver` image that will run the process job runner application.
- ``weaver:4.18.0-manager``: `Weaver` image that will run the API for WPS process and job management.
- ``weaver:4.18.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.

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-base
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"
LABEL vendor="CRIM"
LABEL version="4.17.0"
LABEL version="4.18.0"

# setup paths
ENV APP_DIR=/opt/local/src/weaver
Expand Down
30 changes: 12 additions & 18 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
[bumpversion]
current_version = 4.17.0
current_version = 4.18.0
commit = True
tag = True
tag_name = {new_version}

[bumpversion:file:CHANGES.rst]
search =
search =
`Unreleased <https://github.com/crim-ca/weaver/tree/master>`_ (latest)
========================================================================
replace =
replace =
`Unreleased <https://github.com/crim-ca/weaver/tree/master>`_ (latest)
========================================================================

Changes:
--------
- No change.

Fixes:
------
- No change.

.. _changes_{new_version}:

`{new_version} <https://github.com/crim-ca/weaver/tree/{new_version}>`_ ({now:%%Y-%%m-%%d})
========================================================================

Expand All @@ -42,23 +42,17 @@ search = LABEL version="{current_version}"
replace = LABEL version="{new_version}"

[tool:pytest]
addopts =
addopts =
--strict-markers
--tb=native
weaver/
# enabling 'log_cli' will capture any logging call
# since our CLI tests depend on capturing stdout/stderr,
# this would make them fail because outputs will be redirected to pytest live logging
# instead, use a logger that is nested under the package (i.e.: __package__ + "." + __meta__)
# captured outputs will be reported since the package loggers are enabled based on INI config
capture = tee-sys
log_cli = false
log_level = DEBUG
# FIXME: pytest<7 required to parse below configs (https://github.com/pytest-dev/pytest/issues/10019)
log_format = [%%(asctime)s] %%(levelname)-8.8s [%%(threadName)s][%%(name)s] %%(message)s
log_date_format = %%Y-%%m-%%d %%H:%%M:%%S
python_files = test_*.py
markers =
markers =
cli: mark test as related to CLI operations
testbed14: mark test as 'testbed14' validation
functional: mark test as functionality validation
Expand Down Expand Up @@ -89,7 +83,7 @@ targets = .
[flake8]
ignore = E126,E226,E402,F401,W503,W504
max-line-length = 120
exclude =
exclude =
src,
.git,
__pycache__,
Expand All @@ -114,14 +108,14 @@ add_select = D201,D213
branch = true
source = ./
include = weaver/*
omit =
omit =
setup.py
docs/*
tests/*
*_mako

[coverage:report]
exclude_lines =
exclude_lines =
pragma: no cover
raise AssertionError
raise NotImplementedError
Expand Down
2 changes: 1 addition & 1 deletion weaver/__meta__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__name__ = "weaver"
__title__ = "Weaver"
__version__ = "4.17.0"
__version__ = "4.18.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"
Expand Down

0 comments on commit 3d32d24

Please sign in to comment.