From 792fc85abb73397922aaebfc144425f394d20910 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Wed, 6 Sep 2023 14:41:47 +0000 Subject: [PATCH 1/7] Changing jupyterhub version to work with new image containing mlflow --- birdhouse/config/jupyterhub/default.env | 2 +- birdhouse/env.local.example | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/birdhouse/config/jupyterhub/default.env b/birdhouse/config/jupyterhub/default.env index 6bf21f3cb..4731ce9c2 100644 --- a/birdhouse/config/jupyterhub/default.env +++ b/birdhouse/config/jupyterhub/default.env @@ -5,7 +5,7 @@ # are applied and must be added to the list of DELAYED_EVAL. export JUPYTERHUB_DOCKER=pavics/jupyterhub -export JUPYTERHUB_VERSION=1.4.0-20210506 +export JUPYTERHUB_VERSION=3.0.0-20220926 # 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" diff --git a/birdhouse/env.local.example b/birdhouse/env.local.example index 87e1a53c3..bbef17ae7 100644 --- a/birdhouse/env.local.example +++ b/birdhouse/env.local.example @@ -242,7 +242,8 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass # Jupyter single-user server images #export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:210216 \ # pavics/crim-jupyter-eo:0.3.0 \ -# pavics/crim-jupyter-nlp:0.4.0" +# pavics/crim-jupyter-nlp:0.4.0 \ +# birdhouse/pavics-jupyter-base:mlflow-proxy" # Name of the images displayed on the JupyterHub image selection page # The name order must correspond to the order of the DOCKER_NOTEBOOK_IMAGES variable, @@ -252,7 +253,8 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass # excluded when mounting the corresponding directory. #export JUPYTERHUB_IMAGE_SELECTION_NAMES="pavics \ # eo-crim:0.3.0 \ -# nlp-crim" +# nlp-crim \ +# mlflow-crim" # allow jupyterhub user selection of which notebook image to run # see https://jupyter-docker-stacks.readthedocs.io/en/latest/using/selecting.html @@ -260,6 +262,7 @@ export GEOSERVER_ADMIN_PASSWORD=geoserverpass #c.DockerSpawner.image_whitelist = {os.environ['JUPYTERHUB_IMAGE_SELECTION_NAMES'].split()[0]: os.environ['DOCKER_NOTEBOOK_IMAGES'].split()[0], # os.environ['JUPYTERHUB_IMAGE_SELECTION_NAMES'].split()[1]: os.environ['DOCKER_NOTEBOOK_IMAGES'].split()[1], # os.environ['JUPYTERHUB_IMAGE_SELECTION_NAMES'].split()[2]: os.environ['DOCKER_NOTEBOOK_IMAGES'].split()[2], +# os.environ['JUPYTERHUB_IMAGE_SELECTION_NAMES'].split()[3]: os.environ['DOCKER_NOTEBOOK_IMAGES'].split()[3], # 'jupyter/scipy-notebook': 'jupyter/scipy-notebook', # 'jupyter/r-notebook': 'jupyter/r-notebook', # 'jupyter/tensorflow-notebook': 'jupyter/tensorflow-notebook', From ad538412e4f9b737bd29e63bd67476b7ac40f86d Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Thu, 7 Sep 2023 13:34:03 +0000 Subject: [PATCH 2/7] using latest version for jupyterhub --- birdhouse/config/jupyterhub/default.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdhouse/config/jupyterhub/default.env b/birdhouse/config/jupyterhub/default.env index 4731ce9c2..c949cff84 100644 --- a/birdhouse/config/jupyterhub/default.env +++ b/birdhouse/config/jupyterhub/default.env @@ -5,7 +5,7 @@ # are applied and must be added to the list of DELAYED_EVAL. export JUPYTERHUB_DOCKER=pavics/jupyterhub -export JUPYTERHUB_VERSION=3.0.0-20220926 +export JUPYTERHUB_VERSION=4.0.2-20230816 # 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" From 4d2532a6c4a0f9bd9c330ce27e7f028d59726d4c Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Fri, 8 Sep 2023 13:55:14 +0000 Subject: [PATCH 3/7] Updating changelog --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 57ae4cbf2..3995fe3b7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,6 +22,10 @@ ## Changes +- Changes `JUPYTERHUB_VERSION` from `1.4.0-20210506` to `4.0.2-20230816` + +- Add an image to the list of images that can be launched from JupyterHub which will be used to start an instance of MLflow. + - Add ``optional-components/x-robots-tags-header`` and ``X_ROBOTS_TAGS_HEADER`` variable to allow setting the desired header value server-wide. From 7a03d5a7da68e2874cbfd7b5c01f22ebd3c7f3c8 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Mon, 11 Sep 2023 14:08:52 +0000 Subject: [PATCH 4/7] Updating changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 3995fe3b7..25a025e48 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -25,6 +25,7 @@ - Changes `JUPYTERHUB_VERSION` from `1.4.0-20210506` to `4.0.2-20230816` - Add an image to the list of images that can be launched from JupyterHub which will be used to start an instance of MLflow. + - Note that the jupyter lab google drive extension is not supported with this image. - Add ``optional-components/x-robots-tags-header`` and ``X_ROBOTS_TAGS_HEADER`` variable to allow setting the desired header value server-wide. From 9b8da59af8047ffab34c4850bf7b0a98ddc6a0e2 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Tue, 12 Sep 2023 14:27:21 +0000 Subject: [PATCH 5/7] Adding upgrade db command to jupyterhub docker compose to avoid deployment error --- birdhouse/config/jupyterhub/docker-compose-extra.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/birdhouse/config/jupyterhub/docker-compose-extra.yml b/birdhouse/config/jupyterhub/docker-compose-extra.yml index a3e6bbf9e..e2a489590 100644 --- a/birdhouse/config/jupyterhub/docker-compose-extra.yml +++ b/birdhouse/config/jupyterhub/docker-compose-extra.yml @@ -40,6 +40,8 @@ services: # the Hub and the rest of the stack are on network 'default' - default - jupyterhub_network + # ensure the deployment does not fail when upgrading Jupyterhub version + command: bash -c "jupyterhub upgrade-db && jupyterhub" restart: always logging: *default-logging From a12c0975a865da89d1f72b7822ed451afd706cbe Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Wed, 13 Sep 2023 15:18:49 +0000 Subject: [PATCH 6/7] Fixing changelog --- CHANGES.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index fc0d3a50e..fffeb5582 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,14 @@ [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 + +- Changes `JUPYTERHUB_VERSION` from `1.4.0-20210506` to `4.0.2-20230816`. + - This upgrade is needed to resolve a compatibility issue when using `Spawner.disable_user_config = True` in Jupyterhub + config and the new image which run `jupyter-server 2.7.3`. + +- Add an image to the list of images that can be launched from JupyterHub which will be used to start an instance of MLflow. + - Note that the jupyter lab google drive extension is not supported with this image. [1.30.1](https://github.com/bird-house/birdhouse-deploy/tree/1.30.1) (2023-09-11) ------------------------------------------------------------------------------------------------------------------ @@ -31,11 +38,6 @@ ## Changes -- Changes `JUPYTERHUB_VERSION` from `1.4.0-20210506` to `4.0.2-20230816` - -- Add an image to the list of images that can be launched from JupyterHub which will be used to start an instance of MLflow. - - Note that the jupyter lab google drive extension is not supported with this image. - - Add ``optional-components/x-robots-tags-header`` and ``X_ROBOTS_TAGS_HEADER`` variable to allow setting the desired header value server-wide. From ce5c14df65ebc0dbfc50e097dee0d2b50a0007f5 Mon Sep 17 00:00:00 2001 From: Nazim Azeli Date: Fri, 22 Sep 2023 16:09:24 +0000 Subject: [PATCH 7/7] =?UTF-8?q?Bump=20version:=201.31.3=20=E2=86=92=201.32?= =?UTF-8?q?.0?= 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 6b76b5b32..cf1889f7f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.31.3 +current_version = 1.32.0 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-09-21T01:15:38Z +search = {current_version} 2023-09-22T16:09:24Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2023-09-21T01:15:38Z +values = 2023-09-22T16:09:24Z [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index fc67fc429..9460b7931 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.32.0](https://github.com/bird-house/birdhouse-deploy/tree/1.32.0) (2023-09-22) +------------------------------------------------------------------------------------------------------------------ + ## Changes - Changes `JUPYTERHUB_VERSION` from `1.4.0-20210506` to `4.0.2-20230816`. diff --git a/Makefile b/Makefile index 4bce1a862..f7c9ef7e6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 1.31.3 +override APP_VERSION := 1.32.0 # 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 35bb3602f..fd93acba8 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.31.3.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.32.0.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/1.31.3...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/1.32.0...master -.. |latest-version| image:: https://img.shields.io/badge/tag-1.31.3-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-1.32.0-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/1.31.3 + :target: https://github.com/bird-house/birdhouse-deploy/tree/1.32.0 .. |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 75561ba3d..a352691e0 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -1.31.3 2023-09-21T01:15:38Z +1.32.0 2023-09-22T16:09:24Z diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/birdhouse/config/canarie-api/docker_configuration.py.template index 3c789b61c..0c89368d0 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.31.3', - 'releaseTime': '2023-09-21T01:15:38Z', + 'version': '1.32.0', + 'releaseTime': '2023-09-22T16:09:24Z', '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.31.3', - 'releaseTime': '2023-09-21T01:15:38Z', + 'version': '1.32.0', + 'releaseTime': '2023-09-22T16:09:24Z', 'institution': 'Ouranos', 'researchSubject': 'Climatology', 'supportEmail': '${SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 1a05a1515..8b1daae3f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '1.31.3' +version = '1.32.0' # The full version, including alpha/beta/rc tags. -release = '1.31.3' +release = '1.32.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.