diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 87ff2fb0..e6b02d88 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.2.1 +current_version = 2.2.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} 2024-05-01T15:04:04Z +search = {current_version} 2024-05-11T03:52:01Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-05-01T15:04:04Z +values = 2024-05-11T03:52:01Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index 8e5b99b0..f5e69e7f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,16 @@ [//]: # (list changes here, using '-' for each new entry, remove this when items are added) +[2.2.2](https://github.com/bird-house/birdhouse-deploy/tree/2.2.2) (2024-05-11) +------------------------------------------------------------------------------------------------------------------ + +## Changes +- Jupyter env: new full build with latest of almost everything + + See [Ouranosinc/PAVICS-e2e-workflow-tests#121](https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/121) + for more info. + + [2.2.1](https://github.com/bird-house/birdhouse-deploy/tree/2.2.1) (2024-05-01) ------------------------------------------------------------------------------------------------------------------ diff --git a/Makefile b/Makefile index 3e5e8cde..d6120740 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.2.1 +override APP_VERSION := 2.2.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 7390714d..265c931c 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.2.1.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.2.2.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.2.1...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.2.2...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.2.1-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.2.2-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.2.1 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.2.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 cb571303..6cdce2a6 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.2.1 2024-05-01T15:04:04Z +2.2.2 2024-05-11T03:52:01Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index e92672db..599075e6 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.2.1', - 'releaseTime': '2024-05-01T15:04:04Z', + 'version': '2.2.2', + 'releaseTime': '2024-05-11T03:52:01Z', 'institution': '${SERVER_INSTITUTION}', 'researchSubject': '${SERVER_SUBJECT}', '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.2.1', - 'releaseTime': '2024-05-01T15:04:04Z', + 'version': '2.2.2', + 'releaseTime': '2024-05-11T03:52:01Z', 'institution': '${SERVER_INSTITUTION}', 'researchSubject': '${SERVER_SUBJECT}', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/birdhouse/components/jupyterhub/default.env b/birdhouse/components/jupyterhub/default.env index 134b8ca7..5b08b693 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 DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py39-230601-1-update240116" +export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-240506-update240508" # 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 37a46e74..347d79b8 100644 --- a/birdhouse/env.local.example +++ b/birdhouse/env.local.example @@ -263,7 +263,8 @@ export GEOSERVER_ADMIN_PASSWORD="${__DEFAULT__GEOSERVER_ADMIN_PASSWORD}" #export ALLOW_UNSECURE_HTTP="" # Jupyter single-user server images -#export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:210216 \ +# See components/jupyterhub/default.env for the most updated version of pavics/workflow-tests. +#export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-240506-update240508 \ # pavics/crim-jupyter-eo:0.3.0 \ # pavics/crim-jupyter-nlp:0.4.0 \ # birdhouse/pavics-jupyter-base:mlflow-proxy" diff --git a/docs/source/conf.py b/docs/source/conf.py index 11b9c91b..6052b6c0 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.2.1' +version = '2.2.2' # The full version, including alpha/beta/rc tags. -release = '2.2.1' +release = '2.2.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.