Skip to content

Commit

Permalink
jupyter: new incremental build to include SAlib for sensitivity ana…
Browse files Browse the repository at this point in the history
…lysis and `fstd2nc` to convert RPN files (from Environment Canada) to netCDF files (#398)

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 Ouranosinc/PAVICS-e2e-workflow-tests#128 for
more details about `SAlib` and
Ouranosinc/PAVICS-e2e-workflow-tests#132 for
more details about `fstd2nc`.

birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false
  • Loading branch information
tlvu authored Dec 8, 2023
2 parents f075263 + fe4a8f2 commit 4c74724
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.42.1
current_version = 1.42.2
commit = True
tag = False
tag_name = {new_version}
Expand Down Expand Up @@ -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}'
Expand Down
17 changes: 17 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,23 @@

[//]: # (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

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 about `SAlib` and
https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/132 for more
details about `fstd2nc`.


[1.42.1](https://github.com/bird-house/birdhouse-deploy/tree/1.42.1) (2023-12-07)
------------------------------------------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.42.1 2023-12-07T15:35:26Z
1.42.2 2023-12-08T18:02:01Z
8 changes: 4 additions & 4 deletions birdhouse/config/canarie-api/docker_configuration.py.template
Original file line number Diff line number Diff line change
Expand Up @@ -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}',
Expand Down Expand Up @@ -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}',
Expand Down
2 changes: 1 addition & 1 deletion birdhouse/config/jupyterhub/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -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:230601"
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
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 4c74724

Please sign in to comment.