New docker build for ravenpy birdy xclim

Jenkinsfile

@@ -10,7 +10,7 @@ pipeline {
     // https://jenkins.io/doc/book/pipeline/syntax/
     agent {
         docker {
-            image "pavics/workflow-tests:210415"
+            image "pavics/workflow-tests:210527.1-update20210615"
             label 'linux && docker'
         }
     }

binder/Dockerfile

@@ -1,4 +1,4 @@
-FROM pavics/workflow-tests:210415
+FROM pavics/workflow-tests:210527.1-update20210615
 
 USER root
 

docker/Dockerfile

@@ -31,7 +31,7 @@ RUN python -m ipykernel install --name birdy
 # anything accidentally
 # this is for debug only, all dependencies should be specified in
 # environment.yml above
-# RUN conda install -c zeitsperre -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy nbdime
+# RUN conda install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy nbdime
 
 # build jupyterlab extensions installed by conda, see `jupyter labextension list`
 RUN jupyter lab build

docker/Dockerfile.testing

@@ -0,0 +1,21 @@
+# For testing quickly without having to do a full rebuild.
+
+FROM pavics/workflow-tests:210527.1
+
+USER root
+
+# Use 'update' for existing and 'install' for new package.
+# Keep same channel ordering to not revert anything.
+#RUN umask 0000 \
+#    && conda update -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy clisops xclim \
+#    && pip uninstall -y ravenpy \
+#    && conda install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy ravenpy aiohttp
+
+RUN umask 0000 \
+    && conda update -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy xclim \
+    && conda install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy intake intake-esm gcsfs zarr
+
+#RUN umask 0000 \
+#    && pip install https://github.com/CSHS-CWRA/RavenPy/archive/refs/heads/master.zip
+
+USER jenkins

docker/environment.yml

@@ -1,7 +1,6 @@
 # conda env create -f environment.yml
 name: birdy
 channels:
-  - zeitsperre  # for ravenpy
   - conda-forge
   - cdat
   - bokeh
@@ -45,10 +44,17 @@ dependencies:
   # pinning hvplot did not solve the problem with violin plot.
   - hvplot
   - nc-time-axis
+  # Pin cftime because of https://github.com/SciTools/nc-time-axis/issues/58
+  - cftime==1.4.1
   - statsmodels  # for ravenpy
   # for error 'ImportError: HTTPFileSystem requires "requests" and "aiohttp" to
   # be installed' with call 'fsspec.filesystem('https')'
   - aiohttp
+  - pydantic
+  - intake
+  - intake-esm
+  - gcsfs
+  - zarr
   - xclim
   - ravenpy
   # Universal Regridder for Geospatial Data

launchcontainer

@@ -1,7 +1,7 @@
 #!/bin/sh -x
 
 if [ -z "$DOCKER_IMAGE" ]; then
-    DOCKER_IMAGE="pavics/workflow-tests:210415"
+    DOCKER_IMAGE="pavics/workflow-tests:210527.1-update20210615"
 fi
 
 if [ -z "$CONTAINER_NAME" ]; then

launchnotebook

@@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then
 fi
 
 if [ -z "$DOCKER_IMAGE" ]; then
-    DOCKER_IMAGE="pavics/workflow-tests:210415"
+    DOCKER_IMAGE="pavics/workflow-tests:210527.1-update20210615"
 fi
 
 if [ -z "$CONTAINER_NAME" ]; then