From 6d07ec299cd05d6998cc49b4cfadcabeb9c862ee Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 17 Jan 2024 14:20:54 -0500 Subject: [PATCH 1/2] jupyter: new incremental build for compatibility with upcoming Thredds v5 See https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/134 for more info. --- CHANGES.md | 6 +++++- birdhouse/components/jupyterhub/default.env | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4c131fc6a..7aa166ee5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,11 @@ [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) +## Changes +- Jupyter env: new incremental build for compatibility with upcoming Thredds v5 + + See https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/134 for more info. + [2.0.3](https://github.com/bird-house/birdhouse-deploy/tree/2.0.3) (2024-01-16) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/components/jupyterhub/default.env b/birdhouse/components/jupyterhub/default.env index 6b746cf25..c4a1c5a24 100644 --- a/birdhouse/components/jupyterhub/default.env +++ b/birdhouse/components/jupyterhub/default.env @@ -8,7 +8,7 @@ export JUPYTERHUB_DOCKER=pavics/jupyterhub export JUPYTERHUB_VERSION=4.0.2-20231127 # Jupyter single-user server images, can be overriden in env.local to have a space separated list of multiple images -export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py39-230601-1-update231122" +export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py39-230601-1-update240116" # Name of the image displayed on the JupyterHub image selection page # Can be overriden in env.local to have a space separated list of multiple images, the name order must correspond From c96d41b65c0d6a4e8f8d3f1d270552448c593735 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Sun, 21 Jan 2024 23:23:33 -0500 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=202.0.4=20=E2=86=92=202.0.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 +++++ Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 28d0091d0..a49355a61 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.0.4 +current_version = 2.0.5 commit = True tag = False tag_name = {new_version} @@ -30,11 +30,11 @@ search = {current_version} replace = {new_version} [bumpversion:file:RELEASE.txt] -search = {current_version} 2024-01-18T14:27:21Z +search = {current_version} 2024-01-22T04:23:33Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-01-18T14:27:21Z +values = 2024-01-22T04:23:33Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index db1ec9eff..9a3670b74 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,11 @@ [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.0.5](https://github.com/bird-house/birdhouse-deploy/tree/2.0.5) (2024-01-22) +------------------------------------------------------------------------------------------------------------------ + ## Changes - Jupyter env: new incremental build for compatibility with upcoming Thredds v5 diff --git a/Makefile b/Makefile index e23b7aa6a..4bf7aa456 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.0.4 +override APP_VERSION := 2.0.5 # utility to remove comments after value of an option variable override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g") diff --git a/README.rst b/README.rst index 739fae2b6..2a09feb10 100644 --- a/README.rst +++ b/README.rst @@ -14,13 +14,13 @@ for a full-fledged production platform. * - releases - | |latest-version| |commits-since| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.0.4.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.0.5.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.0.4...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.0.5...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.0.4-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.0.5-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.0.4 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.0.5 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest :alt: ReadTheDocs Build Status (latest version) diff --git a/RELEASE.txt b/RELEASE.txt index 9f8dbd05c..7f4a0920d 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.0.4 2024-01-18T14:27:21Z +2.0.5 2024-01-22T04:23:33Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index 2b85d4ece..8561192ee 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/canarie-api/docker_configuration.py.template @@ -109,8 +109,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.0.4', - 'releaseTime': '2024-01-18T14:27:21Z', + 'version': '2.0.5', + 'releaseTime': '2024-01-22T04:23:33Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', @@ -142,8 +142,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.0.4', - 'releaseTime': '2024-01-18T14:27:21Z', + 'version': '2.0.5', + 'releaseTime': '2024-01-22T04:23:33Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index e62d2ec15..3b825228e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.0.4' +version = '2.0.5' # The full version, including alpha/beta/rc tags. -release = '2.0.4' +release = '2.0.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.