jupyter: new build with latest of everything (#269)

See Ouranosinc/PAVICS-e2e-workflow-tests#106 for more details. ## Changes - Unpin Shapely (fixes Ouranosinc/PAVICS-e2e-workflow-tests#99) - Unpin Dask (fixes Ouranosinc/PAVICS-e2e-workflow-tests#100) - Pin `intake-esm` since newer version activated validation of optional fields and broke our notebooks (Ouranosinc/PAVICS-e2e-workflow-tests#109) - Mamba is fully usable alongside Conda. Previously the installation used Mamba but then Mamba is uninstalled because it breaks the jupyter conda plugin - New packages: - performance optimization: flox, pyston - new feature: geopy, streamlit, python-pptx - jupyter plugin: jupyterlab-tabular-data-editor to easily edit `.csv` files - Removed package: - jupyter-panel-proxy, interfere with `panel serve` commands - Relevant changes (alphabetical order): ```diff < - bokeh=2.4.2=py38h578d9bd_1 > - bokeh=2.4.3=pyhd8ed1ab_3 < - cartopy=0.20.1=py38hf9a4893_1 > - cartopy=0.21.0=py38hf6c3373_3 < - cf_xarray=0.7.2=pyhd8ed1ab_0 > - cf_xarray=0.7.5=pyhd8ed1ab_0 < - cftime=1.6.0=py38h71d37f0_1 > - cftime=1.6.2=py38h26c90d9_1 < - clisops=0.9.0=pyh6c4a22f_0 > - clisops=0.9.3=pyh1a96a4e_0 # unpin < - dask=2022.1.0=pyhd8ed1ab_0 > - dask=2022.11.0=pyhd8ed1ab_0 # new > - flox=0.6.3=pyhd8ed1ab_0 < - fiona=1.8.20=py38hbb147eb_2 > - fiona=1.8.22=py38hc72d8cd_2 < - gdal=3.3.3=py38hcf2042a_0 > - gdal=3.5.3=py38h1f15b03_3 < - geopandas=0.10.2=pyhd8ed1ab_1 > - geopandas=0.12.1=pyhd8ed1ab_1 # new > - geopy=2.3.0=pyhd8ed1ab_0 > - pyston_lite=2.3.4=py38h0a891b7_1 > - python-pptx=0.6.21=pyhd8ed1ab_0 < - ravenpy=0.7.8=pyh8a188c0_0 > - ravenpy=0.9.0=pyha21a80b_0 # pip to conda < - requests-magpie==0.1.1 > - requests-magpie=0.2.0=pyhd8ed1ab_0 < - rioxarray=0.11.1=pyhd8ed1ab_0 > - rioxarray=0.13.1=pyhd8ed1ab_0 < - roocs-utils=0.6.1=pyh6c4a22f_0 > - roocs-utils=0.6.3=pyh1a96a4e_0 # unpin < - shapely=1.7.1=py38hb7fe4a8_5 > - shapely=1.8.5=py38hafd38ec_2 # new > - streamlit=1.15.0=pyhd8ed1ab_0 < - xarray=2022.3.0=pyhd8ed1ab_0 > - xarray=2022.10.0=pyhd8ed1ab_0 < - xclim=0.36.0=pyhd8ed1ab_0 > - xclim=0.39.0=pyhd8ed1ab_0 < - xesmf=0.6.2=pyhd8ed1ab_0 > - xesmf=0.6.3=pyhd8ed1ab_1 # new > - jupyterlab-tabular-data-editor==1.0.0 ```
bird-house · Dec 2, 2022 · 31d9b05 · 31d9b05
2 parents 6bdb8bf + de74b7d
commit 31d9b05
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 16 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.22.4
+current_version = 1.22.5
 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} 2022-11-08T17:42:35Z
+search = {current_version} 2022-12-02T03:34:18Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2022-11-08T17:42:35Z
+values = 2022-12-02T03:34:18Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

diff --git a/CHANGES.md b/CHANGES.md
@@ -14,8 +14,98 @@
 [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.22.5](https://github.com/bird-house/birdhouse-deploy/tree/1.22.5) (2022-12-02)
+------------------------------------------------------------------------------------------------------------------
+
 ## Changes:
 
+- new Jupyter env with latest of everything
+
+  PR https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/pull/106
+
+  - Unpin Shapely (fixes https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/issues/99)
+  - Unpin Dask (fixes https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/issues/100)
+  - Pin `intake-esm` since newer version activated validation of optional fields and broke our notebooks (https://github.com/Ouranosinc/PAVICS-e2e-workflow-tests/issues/109)
+  - Mamba is fully usable alongside Conda.  Previously the installation used Mamba but then Mamba is uninstalled because it breaks the jupyter conda plugin
+  - New packages:
+    - performance optimization: flox, pyston
+    - new feature: geopy, streamlit, python-pptx
+    - jupyter plugin: jupyterlab-tabular-data-editor to easily edit `.csv` files
+   - Removed package:
+     - jupyter-panel-proxy, interfere with `panel serve` commands
+  - Relevant changes (alphabetical order):
+  ```diff
+  <   - bokeh=2.4.2=py38h578d9bd_1
+  >   - bokeh=2.4.3=pyhd8ed1ab_3
+
+  <   - cartopy=0.20.1=py38hf9a4893_1
+  >   - cartopy=0.21.0=py38hf6c3373_3
+
+  <   - cf_xarray=0.7.2=pyhd8ed1ab_0
+  >   - cf_xarray=0.7.5=pyhd8ed1ab_0
+
+  <   - cftime=1.6.0=py38h71d37f0_1
+  >   - cftime=1.6.2=py38h26c90d9_1
+
+  <   - clisops=0.9.0=pyh6c4a22f_0
+  >   - clisops=0.9.3=pyh1a96a4e_0
+
+  # unpin
+  <   - dask=2022.1.0=pyhd8ed1ab_0
+  >   - dask=2022.11.0=pyhd8ed1ab_0
+
+  # new
+  >   - flox=0.6.3=pyhd8ed1ab_0
+
+  <   - fiona=1.8.20=py38hbb147eb_2
+  >   - fiona=1.8.22=py38hc72d8cd_2
+
+  <   - gdal=3.3.3=py38hcf2042a_0
+  >   - gdal=3.5.3=py38h1f15b03_3
+
+  <   - geopandas=0.10.2=pyhd8ed1ab_1
+  >   - geopandas=0.12.1=pyhd8ed1ab_1
+
+  # new
+  >   - geopy=2.3.0=pyhd8ed1ab_0
+  >   - pyston_lite=2.3.4=py38h0a891b7_1
+  >   - python-pptx=0.6.21=pyhd8ed1ab_0
+
+  <   - ravenpy=0.7.8=pyh8a188c0_0
+  >   - ravenpy=0.9.0=pyha21a80b_0
+
+  # pip to conda
+  <     - requests-magpie==0.1.1
+  >   - requests-magpie=0.2.0=pyhd8ed1ab_0
+
+  <   - rioxarray=0.11.1=pyhd8ed1ab_0
+  >   - rioxarray=0.13.1=pyhd8ed1ab_0
+
+  <   - roocs-utils=0.6.1=pyh6c4a22f_0
+  >   - roocs-utils=0.6.3=pyh1a96a4e_0
+
+  # unpin
+  <   - shapely=1.7.1=py38hb7fe4a8_5
+  >   - shapely=1.8.5=py38hafd38ec_2
+
+  # new
+  >   - streamlit=1.15.0=pyhd8ed1ab_0
+
+  <   - xarray=2022.3.0=pyhd8ed1ab_0
+  >   - xarray=2022.10.0=pyhd8ed1ab_0
+
+  <   - xclim=0.36.0=pyhd8ed1ab_0
+  >   - xclim=0.39.0=pyhd8ed1ab_0
+
+  <   - xesmf=0.6.2=pyhd8ed1ab_0
+  >   - xesmf=0.6.3=pyhd8ed1ab_1
+
+  # new
+  >     - jupyterlab-tabular-data-editor==1.0.0
+  ```
+
 - documentation:
   - Add `Weaver` component diagram to better illustrate its interactions with other *birdhouse* services.
   - Move `monitoring` component images under its respective component directory.

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 1.22.4
+override APP_VERSION := 1.22.5
 
 # 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
@@ -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.22.4.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.22.5.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.22.4...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.22.5...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.22.4-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.22.5-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.22.4
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.22.5
 
 .. |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
@@ -1 +1 @@
-1.22.4 2022-11-08T17:42:35Z
+1.22.5 2022-12-02T03:34:18Z
diff --git a/birdhouse/config/canarie-api/docker_configuration.py.template b/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.22.4',
-            'releaseTime': '2022-11-08T17:42:35Z',
+            'version': '1.22.5',
+            'releaseTime': '2022-12-02T03:34:18Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
@@ -242,8 +242,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.22.4',
-            'releaseTime': '2022-11-08T17:42:35Z',
+            'version': '1.22.5',
+            'releaseTime': '2022-12-02T03:34:18Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

diff --git a/birdhouse/default.env b/birdhouse/default.env
@@ -2,7 +2,7 @@
 # All env in this default.env must not depend on any env in env.local.
 
 # 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:220502"
+export DOCKER_NOTEBOOK_IMAGES="pavics/workflow-tests:221118.1"
 
 # 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/docs/source/conf.py b/docs/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.22.4'
+version = '1.22.5'
 # The full version, including alpha/beta/rc tags.
-release = '1.22.4'
+release = '1.22.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.