Skip to content

Commit

Permalink
update Magpie==4.1.1 and Twitcher==0.10.0 (#466)
Browse files Browse the repository at this point in the history
## Overview
Security updates.

## Changes

**Non-breaking changes**
- Magpie/Twitcher: update Python packages and base Docker image to address security vulnerabilities 

  - [Magpie 4.1.1](https://github.com/Ouranosinc/Magpie/blob/master/CHANGES.rst#411-2024-07-23)     (relates to [Ouranosinc/Magpie#622](Ouranosinc/Magpie#622)).
  - [Twitcher 0.10.0](https://github.com/bird-house/twitcher/blob/master/CHANGES.rst#0100-2024-07-22)     (relates to [bird-house/twitcher#136](bird-house/twitcher#136)).

**Breaking changes**
- n/a

## Related Issue / Discussion

PRs that are an agglomeration of vulnerability fixes flagged by Snyk.

- Ouranosinc/Magpie#622
- bird-house/twitcher#136

## Additional Information

- The change from Magpie 3.x to 4.x is caused by the drop of Python 3.5 to 3.7, and the addition of 3.12 some time ago. Major version was used only to highlight this change in case older versions were still employed by some instances. From a technical aspect in birdhouse-deploy, Magpie with Python 3.11 was already in use for a while (see https://github.com/Ouranosinc/Magpie/blob/3.38.0/Dockerfile#L1). Only minor package dependency differences are actually expected.

## CI Operations

birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false
  • Loading branch information
fmigneault authored Sep 11, 2024
2 parents a38b4c5 + e40e990 commit 9c72537
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.5.2
current_version = 2.5.3
commit = True
tag = False
tag_name = {new_version}
Expand Down Expand Up @@ -30,11 +30,11 @@ search = {current_version}
replace = {new_version}

[bumpversion:file:RELEASE.txt]
search = {current_version} 2024-07-19T03:04:07Z
search = {current_version} 2024-09-11T22:57:09Z
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}

[bumpversion:part:releaseTime]
values = 2024-07-19T03:04:07Z
values = 2024-09-11T22:57:09Z

[bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
search = 'version': '{current_version}'
Expand Down
12 changes: 12 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,20 @@
[Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
------------------------------------------------------------------------------------------------------------------

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)

[2.5.3](https://github.com/bird-house/birdhouse-deploy/tree/2.5.3) (2024-09-11)
------------------------------------------------------------------------------------------------------------------

## Changes

- Magpie/Twitcher: update Python packages and base Docker image to address security vulnerabilities

- [Magpie 4.1.1](https://github.com/Ouranosinc/Magpie/blob/master/CHANGES.rst#411-2024-07-23)
(relates to [Ouranosinc/Magpie#622](https://github.com/Ouranosinc/Magpie/pull/622)).
- [Twitcher 0.10.0](https://github.com/bird-house/twitcher/blob/master/CHANGES.rst#0100-2024-07-22)
(relates to [bird-house/twitcher#136](https://github.com/bird-house/twitcher/pull/136)).

- xclim-testdata: adapt repository cloning script to the new data structure

The `xclim-testdata` repo has been restructured to include the data in a `data` subdirectory.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generic variables
override SHELL := bash
override APP_NAME := birdhouse-deploy
override APP_VERSION := 2.5.2
override APP_VERSION := 2.5.3

# utility to remove comments after value of an option variable
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ for a full-fledged production platform.
* - citation
- | |citation|

.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.5.2.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.5.3.svg
:alt: Commits since latest release
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.2...master
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.3...master

.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.2-blue.svg?style=flat
.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.3-blue.svg?style=flat
:alt: Latest Tag
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.2
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.3

.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
:alt: ReadTheDocs Build Status (latest version)
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.2 2024-07-19T03:04:07Z
2.5.3 2024-09-11T22:57:09Z
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,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': '2.5.2',
'releaseTime': '2024-07-19T03:04:07Z',
'version': '2.5.3',
'releaseTime': '2024-09-11T22:57:09Z',
'institution': '${BIRDHOUSE_INSTITUTION}',
'researchSubject': '${BIRDHOUSE_SUBJECT}',
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
Expand Down Expand Up @@ -141,8 +141,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': '2.5.2',
'releaseTime': '2024-07-19T03:04:07Z',
'version': '2.5.3',
'releaseTime': '2024-09-11T22:57:09Z',
'institution': '${BIRDHOUSE_INSTITUTION}',
'researchSubject': '${BIRDHOUSE_SUBJECT}',
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/components/magpie/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# are applied and must be added to the list of DELAYED_EVAL.

# Tag version that will be used to update Magpie API, Magpie CLI, and matching Twitcher with Magpie Adapter
export MAGPIE_VERSION=3.38.0
export MAGPIE_VERSION=4.1.1

export MAGPIE_DB_NAME="magpiedb"

Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
# built documents.
#
# The short X.Y version.
version = '2.5.2'
version = '2.5.3'
# The full version, including alpha/beta/rc tags.
release = '2.5.2'
release = '2.5.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 9c72537

Please sign in to comment.