From b7d167d411ff1908233d0bfb1ca70da2c729c34e Mon Sep 17 00:00:00 2001 From: Long Vu Date: Tue, 7 Nov 2023 21:37:53 -0500 Subject: [PATCH 1/3] jupyter: new incremental build to include `SAlib` for sensitivity analysis Also make `/notebook_dir/` read-only to avoid users putting their files there and losing them since only `/notebook_dir/writable-workspace` is persisted on disk. See https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/128 for more details. --- CHANGES.md | 11 ++++++++++- birdhouse/config/jupyterhub/default.env | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5f0cd08a4..a858ad3ae 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,16 @@ [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: new incremental build to include `SAlib` for sensitivity analysis + + Also make `/notebook_dir/` read-only to avoid users putting their files there + and losing them since only `/notebook_dir/writable-workspace` is persisted on + disk. + + See https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/128 for more + details. + [1.37.1](https://github.com/bird-house/birdhouse-deploy/tree/1.37.1) (2023-11-03) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/config/jupyterhub/default.env b/birdhouse/config/jupyterhub/default.env index d8ffba773..f37e45cc0 100644 --- a/birdhouse/config/jupyterhub/default.env +++ b/birdhouse/config/jupyterhub/default.env @@ -8,7 +8,7 @@ export JUPYTERHUB_DOCKER=pavics/jupyterhub export JUPYTERHUB_VERSION=4.0.2-20231002 # 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:230601" +export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py39-230601-1-update231025" # 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 ef28aeb673600f810e7276ee01d0de6c8f2354e8 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Tue, 5 Dec 2023 20:04:38 -0500 Subject: [PATCH 2/3] jupyter: new incremental build to add `fstd2nc` --- CHANGES.md | 5 ++++- birdhouse/config/jupyterhub/default.env | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 31fbcf17f..2f2317cd2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,13 +17,16 @@ ## Changes - Jupyter: new incremental build to include `SAlib` for sensitivity analysis + and `fstd2nc` to convert RPN files (from Environment Canada) to netCDF files Also make `/notebook_dir/` read-only to avoid users putting their files there and losing them since only `/notebook_dir/writable-workspace` is persisted on disk. See https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/128 for more - details. + details about `SAlib` and + https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/132 for more + details about `fstd2nc`. [1.42.0](https://github.com/bird-house/birdhouse-deploy/tree/1.42.0) (2023-11-30) diff --git a/birdhouse/config/jupyterhub/default.env b/birdhouse/config/jupyterhub/default.env index 68f67dfcd..c37e1cf32 100644 --- a/birdhouse/config/jupyterhub/default.env +++ b/birdhouse/config/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-update231025" +export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py39-230601-1-update231122" # 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 fe4a8f26d7ec42e5fbf2a9d32314c7c3e878996c Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 8 Dec 2023 13:02:01 -0500 Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=201.42.1=20=E2=86=92=201.42?= =?UTF-8?q?.2?= 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 +- .../config/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 26103cd65..159cbefc3 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.42.1 +current_version = 1.42.2 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} 2023-12-07T15:35:26Z +search = {current_version} 2023-12-08T18:02:01Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-12-07T15:35:26Z +values = 2023-12-08T18:02:01Z [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index aa67e39eb..44e423220 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) + +[1.42.2](https://github.com/bird-house/birdhouse-deploy/tree/1.42.2) (2023-12-08) +------------------------------------------------------------------------------------------------------------------ + ## Changes - Jupyter: new incremental build to include `SAlib` for sensitivity analysis and `fstd2nc` to convert RPN files (from Environment Canada) to netCDF files diff --git a/Makefile b/Makefile index 3cc79282e..1ec145699 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 1.42.1 +override APP_VERSION := 1.42.2 # 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 361e76286..c1c8b827f 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/1.42.1.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.42.2.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.42.1...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.42.2...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.42.1-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.42.2-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.42.1 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.42.2 .. |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 4726b3db5..0399b4f80 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.42.1 2023-12-07T15:35:26Z +1.42.2 2023-12-08T18:02:01Z diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index c290dc84c..5313d0240 100644 --- a/birdhouse/config/canarie-api/docker_configuration.py.template +++ b/birdhouse/config/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': '1.42.1', - 'releaseTime': '2023-12-07T15:35:26Z', + 'version': '1.42.2', + 'releaseTime': '2023-12-08T18:02:01Z', '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': '1.42.1', - 'releaseTime': '2023-12-07T15:35:26Z', + 'version': '1.42.2', + 'releaseTime': '2023-12-08T18:02:01Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index accd1bec2..ac8909bd6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '1.42.1' +version = '1.42.2' # The full version, including alpha/beta/rc tags. -release = '1.42.1' +release = '1.42.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.