From faac2dfc3cafef0d01af4fb746b55701e2bcfbc9 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 13 Nov 2024 18:21:32 -0500 Subject: [PATCH 1/2] jupyter: update to release py311-241111 --- CHANGES.md | 7 ++++++- birdhouse/components/jupyterhub/default.env | 2 +- birdhouse/env.local.example | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2059da724..f18c00eb5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,12 @@ [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 full build with latest of everything + + See [Ouranosinc/PAVICS-e2e-workflow-tests#137](https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/137) + for more info. + [2.5.4](https://github.com/bird-house/birdhouse-deploy/tree/2.5.4) (2024-10-31) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/components/jupyterhub/default.env b/birdhouse/components/jupyterhub/default.env index b52b7ff2e..91f40f08e 100644 --- a/birdhouse/components/jupyterhub/default.env +++ b/birdhouse/components/jupyterhub/default.env @@ -10,7 +10,7 @@ export JUPYTERHUB_IMAGE='${JUPYTERHUB_DOCKER}:${JUPYTERHUB_VERSION}' export JUPYTERHUB_IMAGE_URI='registry.hub.docker.com/${JUPYTERHUB_IMAGE}' # Jupyter single-user server images, can be overriden in env.local to have a space separated list of multiple images -export JUPYTERHUB_DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-240506-update240508" +export JUPYTERHUB_DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-241111" # 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 diff --git a/birdhouse/env.local.example b/birdhouse/env.local.example index 8ca61f137..7a2a68c80 100644 --- a/birdhouse/env.local.example +++ b/birdhouse/env.local.example @@ -262,7 +262,7 @@ export GEOSERVER_ADMIN_PASSWORD="${__DEFAULT__GEOSERVER_ADMIN_PASSWORD}" #export BIRDHOUSE_ALLOW_UNSECURE_HTTP="" # Jupyter single-user server images -#export JUPYTERHUB_DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-240506-update240508 \ +#export JUPYTERHUB_DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-241111 \ # pavics/crim-jupyter-eo:0.3.0 \ # pavics/crim-jupyter-nlp:0.4.0 \ # birdhouse/pavics-jupyter-base:mlflow-proxy" From 61bdcc6e8ace6012b89724b433f8ed064bb48ab8 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 14 Nov 2024 16:04:17 -0500 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=202.5.4=20=E2=86=92=202.5.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 e3e23dc1b..b9d85e110 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.5.4 +current_version = 2.5.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-10-31T15:06:05Z +search = {current_version} 2024-11-14T21:04:17Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-10-31T15:06:05Z +values = 2024-11-14T21:04:17Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index f18c00eb5..2418168d5 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.5.5](https://github.com/bird-house/birdhouse-deploy/tree/2.5.5) (2024-11-14) +------------------------------------------------------------------------------------------------------------------ + ## Changes - Jupyter env: new full build with latest of everything diff --git a/Makefile b/Makefile index 71e102f26..085051c8d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.5.4 +override APP_VERSION := 2.5.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 e6e54adb7..e291e85dc 100644 --- a/README.rst +++ b/README.rst @@ -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.4.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.5.5.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.4...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.5...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.4-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.5-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.4 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.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 850fab3bc..26d8c76b4 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.5.4 2024-10-31T15:06:05Z +2.5.5 2024-11-14T21:04:17Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index fe77d5a80..c0a3248e6 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/canarie-api/docker_configuration.py.template @@ -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.4', - 'releaseTime': '2024-10-31T15:06:05Z', + 'version': '2.5.5', + 'releaseTime': '2024-11-14T21:04:17Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', @@ -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.4', - 'releaseTime': '2024-10-31T15:06:05Z', + 'version': '2.5.5', + 'releaseTime': '2024-11-14T21:04:17Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 5e7577787..b484a165f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.5.4' +version = '2.5.5' # The full version, including alpha/beta/rc tags. -release = '2.5.4' +release = '2.5.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.