Jupyter docker: new full build with latest of almost everything except xclim and ravenpy to smooth transition

Jenkinsfile

@@ -10,7 +10,7 @@ pipeline {
     // https://jenkins.io/doc/book/pipeline/syntax/
     agent {
         docker {
-            image "pavics/workflow-tests:py39-230601-1-update240116"
+            image "pavics/workflow-tests:py311-240506-update240508"
             label 'linux && docker'
         }
     }
@@ -82,7 +82,7 @@ Requires 'weaver' component to be active on the target 'PAVICS_HOST' server
         string(name: 'RAVENPY_REPO', defaultValue: 'CSHS-CWRA/RavenPy',
                description: 'https://github.com/CSHS-CWRA/RavenPy repo or fork to test against.', trim: true)
         booleanParam(name: 'TEST_ESGF_COMPUTE_API_REPO', defaultValue: false,
-                     description: 'Check the box to test esgf-compute-api repo.')
+                     description: 'Check the box to test esgf-compute-api repo.  Kept here for historical reasons only, not working anymore.')
         string(name: 'ESGF_COMPUTE_API_BRANCH', defaultValue: 'devel',
                description: 'ESGF_COMPUTE_API_REPO branch to test against.', trim: true)
         string(name: 'ESGF_COMPUTE_API_REPO', defaultValue: 'ESGF/esgf-compute-api',
@@ -100,6 +100,8 @@ Requires 'weaver' component to be active on the target 'PAVICS_HOST' server
         booleanParam(name: 'SAVE_RESULTING_NOTEBOOK', defaultValue: true,
                      description: '''Check the box to save the resulting notebooks of the run.
 Note this is another run, will double the time and no guaranty to have same error as the run from py.test.''')
+        string(name: 'SAVE_RESULTING_NOTEBOOK_TIMEOUT', defaultValue: '240',
+               description: 'Timeout in sec for nbconvert.  For slow notebooks or slow machine', trim: true)
     }
 
     triggers {

binder/Dockerfile

@@ -1,4 +1,4 @@
-FROM pavics/workflow-tests:py39-230601-1-update240116
+FROM pavics/workflow-tests:py311-240506-update240508
 
 USER root
 

docker/Dockerfile

@@ -3,7 +3,7 @@ FROM continuumio/miniconda3
 # Use mamba for much improved performance over conda.
 # The 'channel_priority strict' did help conda but it was not enough.
 RUN conda update conda -n base && \
-    conda install mamba -n base -c conda-forge -c defaults && \
+    conda install mamba conda-pack -n base -c conda-forge -c defaults && \
     conda clean --all --yes && \
     conda config --set channel_priority strict && \
     wget -qO- https://micro.mamba.pm/api/micromamba/linux-64/latest | tar -C /usr/local -xvj bin/micromamba
@@ -21,7 +21,7 @@ RUN apt-get update && \
 # Create user jenkins for our Jenkins e2e notebooks test suite.
 # Change /opt/conda folder permissions for jupyter-conda extension.
 RUN groupadd --gid 1000 jenkins \
-    && useradd --uid 1000 --gid jenkins --create-home jenkins && \
+    && useradd --uid 1000 --gid jenkins --shell /bin/bash --create-home jenkins && \
     chmod -R a+rwX /opt/conda
 
 COPY environment.yml /environment.yml
@@ -43,10 +43,8 @@ COPY environment.yml /environment.yml
 # Conda was stuck at this step:
 # DEBUG conda.common._logic:_run_sat(607): Invoking SAT with clause count: 2500273
 #
-# Python 3.10 cause this "ValueError: `popmean.shape[axis]` must equal 1." in
-# homepage nb 4, see https://github.com/Ouranosinc/PAVICS-landing/issues/65
 RUN umask 0000 && \
-    mamba create --name birdy --channel conda-forge --channel defaults xclim ravenpy python=3.9 --yes && \
+    mamba create --name birdy --channel conda-forge --channel defaults xclim ravenpy python=3.11 --yes && \
     mamba env update --name birdy --file /environment.yml && \
     mamba clean --all --yes
 
@@ -97,7 +95,9 @@ RUN wget https://raw.githubusercontent.com/jupyter/docker-stacks/$DOCKER_STACKS_
     wget https://raw.githubusercontent.com/jupyter/docker-stacks/$DOCKER_STACKS_COMMIT/base-notebook/jupyter_notebook_config.py --output-document /etc/jupyter/jupyter_notebook_config.py && \
     chmod a+rx /usr/local/bin/start.sh /usr/local/bin/start-singleuser.sh /usr/local/bin/start-notebook.sh /usr/local/bin/fix-permissions && \
     chmod a+r /etc/jupyter/jupyter_notebook_config.py && \
-    mkdir /notebook_dir && chown jenkins /notebook_dir && \
+    mkdir -p /notebook_dir/writable-workspace && chown jenkins /notebook_dir/writable-workspace && \
+    mkdir -p /notebook_dir/pavics-homepage && chown jenkins /notebook_dir/pavics-homepage && \
+    chown root:root /notebook_dir && chmod a-w /notebook_dir && \
     chmod a+rwX -R /opt/conda/envs/birdy/fonts && \
     mkdir /opt/conda/pkgs/cache && \
     chown jenkins:jenkins -R /opt/conda/pkgs/cache && \

docker/Dockerfile.testing

@@ -1,6 +1,6 @@
 # For testing quickly without having to do a full rebuild.
 
-FROM pavics/workflow-tests:py39-230601-1-update231122
+FROM pavics/workflow-tests:py311-240506
 
 #ENV ESMFMKFILE="/opt/conda/envs/birdy/lib/esmf.mk"
 
@@ -11,9 +11,11 @@ USER root
 # Use 'update' for existing and 'install' for new package.
 # Keep same channel ordering to not revert anything.
 RUN umask 0000 \
-     && pip install --no-cache-dir https://github.com/bird-house/threddsclient/archive/refs/heads/master.zip
-#    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyviz/label/dev -c defaults -n birdy salib \
-#    && mamba clean --all --yes
+    && pip uninstall -y ravenpy birdhouse-birdy \
+    && pip install --no-cache-dir --no-deps ravenpy==0.13.1 birdhouse-birdy==0.8.7 \
+    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyviz/label/dev -c defaults -n birdy jupyterlab-git==0.44.0 \
+    && mamba clean --all --yes
+#    && pip install --no-cache-dir --upgrade figanos
 #    && pip uninstall -y ravenpy \
 #    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy ravenpy aiohttp
 

docker/environment.yml

@@ -4,7 +4,7 @@ channels:
   - conda-forge
   - cdat
   - bokeh
-  - plotly  # for jupyter-dash
+    # - plotly  # for jupyter-dash
     #  - pyston
   - pyviz/label/dev  # for jupyter-panel-proxy, panel
   - defaults
@@ -19,8 +19,13 @@ dependencies:
 
   # Pin latest xclim and ravenpy to avoid downgrading during the second installation phase.
   # Mamba is quicker to solve dependencies than conda, but it is less precise so accidental downgrades can happen.
-  - xclim >= 0.43.0
-  - ravenpy >= 0.12.1
+  - xclim >= 0.47.0
+  - ravenpy >= 0.13.0
+
+  # https://anaconda.org/conda-forge/xscen
+  # A climate change scenario-building analysis framework, built with xclim/xarray.
+  # PIN to 0.8.2 for xclim 0.47.0 compat
+  - xscen == 0.8.2
 
     #- dask  # from xclim and ravenpy
     #- distributed
@@ -32,13 +37,10 @@ dependencies:
   - matplotlib
     # - xarray  # from xclim and ravenpy
     # - numpy  # from xclim and ravenpy
-  # TODO: unpin numpy, pinned for hvplot.quadmesh(rasterize=True)
-  # datashade=True is an alias
-  # See https://github.com/holoviz/hvplot/issues/1073
-  - numpy <= 1.23.5
+  - numpy
   # TODO: unpin cf_xarray due to https://github.com/xarray-contrib/cf-xarray/issues/442
   - cf_xarray != 0.8.1
-  - birdy
+  - birdy >= 0.8.7
     # - owslib>=0.23.0  # from ravenpy
     # - netcdf4  # from ravenpy
   # TODO: remove libnetcdf PIN because https://github.com/Ouranosinc/PAVICS-landing/issues/66
@@ -49,6 +51,10 @@ dependencies:
   - cfgrib
   - pydap
   - cartopy >= 0.21.0
+  # Fixes cartopy bug arising with scipy 1.11.
+  # https://github.com/Ouranosinc/pavics-sdi/pull/298
+  # https://github.com/Ouranosinc/pavics-sdi/issues/294
+  - pykdtree
   - descartes # Is this really needed???
     # - rasterio  # from ravenpy
     # - gdal  # for osgeo, from ravenpy
@@ -60,15 +66,14 @@ dependencies:
   - pyogrio
   - scikit-image
   - ipyleaflet
-  - threddsclient
+  - threddsclient >= 0.4.5
   - bokeh
   - regionmask
   - siphon
   - jupyter_bokeh
   - pscript
   - h5netcdf
-  # TODO: remove panel pin when Analogues dashboard works
-  - panel <= 0.14.4
+  - panel >= 1.2.2
   # https://github.com/holoviz/panel
   - pyviz_comms  # (was labextension pyviz/jupyterlab_pyviz in jupyterlab v2)
   - holoviews
@@ -79,6 +84,8 @@ dependencies:
   # https://github.com/bird-house/birdhouse-deploy/pull/63#issuecomment-668270608
   # pinning hvplot did not solve the problem with violin plot.
   - hvplot
+  # https://anaconda.org/conda-forge/dash
+  - dash >= 2.16.1
   # https://streamlit.io/
   # https://anaconda.org/conda-forge/streamlit
   - streamlit
@@ -89,6 +96,9 @@ dependencies:
   # https://python-pptx.readthedocs.io/en/latest/
   # https://anaconda.org/conda-forge/python-pptx
   - python-pptx
+  # openpyxl: library to read/write Excel 2010 xlsx/xlsm files
+  # https://anaconda.org/conda-forge/openpyxl
+  - openpyxl
   - nc-time-axis
     # - cftime  # from xclim and ravenpy
     # - statsmodels  # for ravenpy
@@ -102,11 +112,7 @@ dependencies:
   # Plugin for building and loading intake catalogs for earth system data sets
   # holdings, such as CMIP (Coupled Model Intercomparison Project) and CESM
   # Large Ensemble datasets.
-  # Pin intake-esm since newer version activated validation of optional fields and broke our notebooks
-  #  ValidationError: 1 validation error for ESMCatalogModel
-  #  aggregation_control
-  #    field required (type=value_error.missing)
-  - intake-esm <= 2021.8.17
+  - intake-esm >= 2023.6.14
   # load netCDF, Zarr and other multi-dimensional data (xarray_image, netcdf,
   # grib, opendap, rasterio, remote-xarray, zarr)
   - intake-xarray
@@ -140,7 +146,8 @@ dependencies:
   - esgf-compute-api
   # https://anaconda.org/conda-forge/esgf-pyclient (for pavics-sdi esgf-dap.ipynb)
   - esgf-pyclient
-  - cdms2
+  # Disable cdms2 because it was forcing python downgrade to 3.10 and below.
+  #- cdms2
   # Disable vcs because it was forcing python downgrade to below 3.9.
   # See https://github.com/CDAT/vcs/issues/457
   #   package vcs-8.1-py_0 requires vtk-cdat >8.1, but none of the providers can be installed
@@ -168,10 +175,12 @@ dependencies:
   # extension to produce .py files from notebook .ipynb files
   - jupytext
   # jupyterlab extension for git
-  - jupyterlab-git
+  - jupyterlab-git >= 0.44.0
   # Voilà turns Jupyter notebooks into standalone web applications
   - voila
-  - jupyter-archive
+  # PIN jupyter-archive due to
+  # https://github.com/jupyterlab-contrib/jupyter-archive/issues/132
+  - jupyter-archive <= 3.3.4
   # https://github.com/jtpio/jupyterlab-topbar
   - jupyterlab-topbar
   # https://github.com/jtpio/jupyterlab-system-monitor (was from jupyterlab-topbar)
@@ -180,7 +189,6 @@ dependencies:
   - nbresuse  # needed by jupyterlab-system-monitor
   # xeus-python: back-end kernel implementing the Jupyter Debug Protocol
   - xeus-python
-  - jupyter-dash
   # https:://github.com/jupyterhub/jupyter-server-proxy
   - jupyter-server-proxy
   # https://github.com/dask/dask-labextension
@@ -225,6 +233,10 @@ dependencies:
     # https://pypi.org/project/fstd2nc/
     # Converts RPN standard files (from Environment Canada) to netCDF files.
     - fstd2nc
+    # https://pypi.org/project/figanos/
+    # Outils pour produire des graphiques informatifs sur les impacts des
+    # changements climatiques.
+    - figanos
     # visual debugger for Jupyter Notebook, not working with JupyterLab at this moment
     - pixiedust
     # block execution of 'run_all_cells' until user input finished