jupyter: new image to add esgf-pyclient and xncml to fix Jenkins failure (#308)

Jupyter: new image to add esgf-pyclient and xncml to fix Jenkins failure

See PR Ouranosinc/PAVICS-e2e-workflow-tests#118
for more details.

- Adds `esgf-pyclient` for esgf-dap.ipynb
(Ouranosinc/pavics-sdi#269)
- Adds `xncml` for gen_catalog refactoring
(Ouranosinc/pavics-vdb#46)
- Fixes annoying harmless error `ERROR 1: PROJ:
proj_create_from_database: Open of /opt/conda/envs/birdy/share/proj
failed`
- Relevant changes (alphabetical order):
```diff
>   - esgf-pyclient=0.3.1=pyh1a96a4e_2

<   - gdal=3.5.3=py38h1f15b03_4
>   - gdal=3.6.0=py38h58634bd_13

>     - xncml==0.2
```

Author: tlvu

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.25.1
+current_version = 1.25.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} 2023-04-11T13:01:09Z
+search = {current_version} 2023-04-12T02:13:00Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-04-11T13:01:09Z
+values = 2023-04-12T02:13:00Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -16,6 +16,28 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[1.25.2](https://github.com/bird-house/birdhouse-deploy/tree/1.25.2) (2023-04-12)
+------------------------------------------------------------------------------------------------------------------
+
+## Changes
+- Jupyter: new image to add esgf-pyclient and xncml to fix Jenkins failure
+
+  See PR https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/118 for more details.
+
+  - Adds `esgf-pyclient` for esgf-dap.ipynb (https://github.com/Ouranosinc/pavics-sdi/pull/269)
+  - Adds `xncml` for gen_catalog refactoring (https://github.com/Ouranosinc/pavics-vdb/pull/46)
+  - Fixes annoying harmless error `ERROR 1: PROJ: proj_create_from_database: Open of /opt/conda/envs/birdy/share/proj failed`
+  - Relevant changes (alphabetical order):
+  ```diff
+  >   - esgf-pyclient=0.3.1=pyh1a96a4e_2
+
+  <   - gdal=3.5.3=py38h1f15b03_4
+  >   - gdal=3.6.0=py38h58634bd_13
+
+  >     - xncml==0.2
+  ```
+
+
 [1.25.1](https://github.com/bird-house/birdhouse-deploy/tree/1.25.1) (2023-04-11)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 1.25.1
+override APP_VERSION := 1.25.2
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

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.25.1.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.25.2.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.25.1...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.25.2...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.25.1-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.25.2-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.25.1
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.25.2
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

@@ -1 +1 @@
-1.25.1 2023-04-11T13:01:09Z
+1.25.2 2023-04-12T02:13:00Z

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

@@ -17,8 +17,8 @@ SERVICES = {
         'info': {
             'name': 'Node',
             'synopsis': 'Nodes are data, compute and index endpoints accessed through the PAVICS platform or external clients. The Node service is the backend that allows: data storage, harvesting, indexation and discovery of local and federated data; authentication and authorization; server registration and management. Node service is therefore composed of several other services.',
-            'version': '1.25.1',
-            'releaseTime': '2023-04-11T13:01:09Z',
+            'version': '1.25.2',
+            'releaseTime': '2023-04-12T02:13:00Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
@@ -47,8 +47,8 @@ PLATFORMS = {
         'info': {
             'name': 'PAVICS',
             'synopsis': 'The PAVICS (Power Analytics for Visualization of Climate Science) platform is a collection of climate analysis services served through Open Geospatial Consortium (OGC) protocols. These services include data access, processing and visualization. Both data and algorithms can be accessed either programmatically, through OGC-compliant clients such as QGIS or ArcGIS, or a custom web interface.',
-            'version': '1.25.1',
-            'releaseTime': '2023-04-11T13:01:09Z',
+            'version': '1.25.2',
+            'releaseTime': '2023-04-12T02:13:00Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

birdhouse/config/jupyterhub/default.env

@@ -5,7 +5,7 @@
 # are applied and must be added to the list of DELAYED_EVAL.
 
 # 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:221130"
+export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:221130-update230403"
 
 # 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

docs/source/conf.py

@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.25.1'
+version = '1.25.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.25.1'
+release = '1.25.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.