Skip to content

Commit 1528ba1

Browse files
authored
Jupyter: update to release py311-241111 (#475)
## Overview Update Jupyter env to latest version, see Ouranosinc/PAVICS-e2e-workflow-tests#137 for more info. ## Changes **Non-breaking changes** - Update Jupyter env to version `py311-241111`. **Breaking changes** - This new Jupyter env requires the Jenkins host to be updated. Jenkins host upgrade problem found and fix on Ouranos side can be found here Ouranosinc/jenkins-config#16. ## Related Issue / Discussion - Resolves [issue id](url) ## Additional Information Links to other issues or sources. - [ ] Things to do... ## CI Operations <!-- The test suite can be run using a different DACCS config with ``birdhouse_daccs_configs_branch: branch_name`` in the PR description. To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci`` set to ``true`` in the PR description. Using ``[<cmd>]`` (with the brackets) where ``<cmd> = skip ci`` in the commit message will override ``birdhouse_skip_ci`` from the PR description. Such commit command can be used to override the PR description behavior for a specific commit update. However, a commit message cannot 'force run' a PR which the description turns off the CI. To run the CI, the PR should instead be updated with a ``true`` value, and a running message can be posted in following PR comments to trigger tests once again. --> birdhouse_daccs_configs_branch: master birdhouse_skip_ci: false
2 parents 11a589f + 61bdcc6 commit 1528ba1

File tree

9 files changed

+27
-17
lines changed

9 files changed

+27
-17
lines changed

.bumpversion.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 2.5.4
2+
current_version = 2.5.5
33
commit = True
44
tag = False
55
tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
3030
replace = {new_version}
3131

3232
[bumpversion:file:RELEASE.txt]
33-
search = {current_version} 2024-10-31T15:06:05Z
33+
search = {current_version} 2024-11-14T21:04:17Z
3434
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
3535

3636
[bumpversion:part:releaseTime]
37-
values = 2024-10-31T15:06:05Z
37+
values = 2024-11-14T21:04:17Z
3838

3939
[bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
4040
search = 'version': '{current_version}'

CHANGES.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@
1717

1818
[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
1919

20+
[2.5.5](https://github.com/bird-house/birdhouse-deploy/tree/2.5.5) (2024-11-14)
21+
------------------------------------------------------------------------------------------------------------------
22+
23+
## Changes
24+
- Jupyter env: new full build with latest of everything
25+
26+
See [Ouranosinc/PAVICS-e2e-workflow-tests#137](https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/137)
27+
for more info.
28+
29+
2030
[2.5.4](https://github.com/bird-house/birdhouse-deploy/tree/2.5.4) (2024-10-31)
2131
------------------------------------------------------------------------------------------------------------------
2232

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generic variables
22
override SHELL := bash
33
override APP_NAME := birdhouse-deploy
4-
override APP_VERSION := 2.5.4
4+
override APP_VERSION := 2.5.5
55

66
# utility to remove comments after value of an option variable
77
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ for a full-fledged production platform.
1818
* - citation
1919
- | |citation|
2020

21-
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.5.4.svg
21+
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.5.5.svg
2222
:alt: Commits since latest release
23-
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.4...master
23+
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.5...master
2424

25-
.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.4-blue.svg?style=flat
25+
.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.5-blue.svg?style=flat
2626
:alt: Latest Tag
27-
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.4
27+
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.5
2828

2929
.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
3030
:alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.4 2024-10-31T15:06:05Z
1+
2.5.5 2024-11-14T21:04:17Z

birdhouse/components/canarie-api/docker_configuration.py.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ SERVICES = {
108108
# NOTE:
109109
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
110110
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
111-
'version': '2.5.4',
112-
'releaseTime': '2024-10-31T15:06:05Z',
111+
'version': '2.5.5',
112+
'releaseTime': '2024-11-14T21:04:17Z',
113113
'institution': '${BIRDHOUSE_INSTITUTION}',
114114
'researchSubject': '${BIRDHOUSE_SUBJECT}',
115115
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
141141
# NOTE:
142142
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
143143
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
144-
'version': '2.5.4',
145-
'releaseTime': '2024-10-31T15:06:05Z',
144+
'version': '2.5.5',
145+
'releaseTime': '2024-11-14T21:04:17Z',
146146
'institution': '${BIRDHOUSE_INSTITUTION}',
147147
'researchSubject': '${BIRDHOUSE_SUBJECT}',
148148
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

birdhouse/components/jupyterhub/default.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export JUPYTERHUB_IMAGE='${JUPYTERHUB_DOCKER}:${JUPYTERHUB_VERSION}'
1010
export JUPYTERHUB_IMAGE_URI='registry.hub.docker.com/${JUPYTERHUB_IMAGE}'
1111

1212
# Jupyter single-user server images, can be overriden in env.local to have a space separated list of multiple images
13-
export JUPYTERHUB_DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-240506-update240508"
13+
export JUPYTERHUB_DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-241111"
1414

1515
# Name of the image displayed on the JupyterHub image selection page
1616
# Can be overriden in env.local to have a space separated list of multiple images, the name order must correspond

birdhouse/env.local.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ export GEOSERVER_ADMIN_PASSWORD="${__DEFAULT__GEOSERVER_ADMIN_PASSWORD}"
262262
#export BIRDHOUSE_ALLOW_UNSECURE_HTTP=""
263263

264264
# Jupyter single-user server images
265-
#export JUPYTERHUB_DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-240506-update240508 \
265+
#export JUPYTERHUB_DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:py311-241111 \
266266
# pavics/crim-jupyter-eo:0.3.0 \
267267
# pavics/crim-jupyter-nlp:0.4.0 \
268268
# birdhouse/pavics-jupyter-base:mlflow-proxy"

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
# built documents.
7070
#
7171
# The short X.Y version.
72-
version = '2.5.4'
72+
version = '2.5.5'
7373
# The full version, including alpha/beta/rc tags.
74-
release = '2.5.4'
74+
release = '2.5.5'
7575

7676
# The language for content autogenerated by Sphinx. Refer to documentation
7777
# for a list of supported languages.

0 commit comments

Comments
 (0)