Jupyter docker: incremental build to add SAlib for new RavenPY nb Sensitivity_analysis.ipynb

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,16 +4,60 @@ Please include a summary of the changes and which issues is fixed. Please also i
 
 This PR fixes [issue id](url)
 
+
 ## Changes
 
 - Adds...
+- Jupyter env changes:
+  - Change 1 (related PR url)
+  - Change 2 (related PR url)
+  - Relevant changes (alphabetical order):
+```diff
+<   - somelib=0.8.1=pyh6c4a22f_1
+>   - somelib=0.8.4=pyh1a96a4e_0
+
+(...)
+
+```
+
+
+## Test
+
+- Deployed as "beta" image in production for bokeh visualization performance regression testing.
+- Manual test notebook https://github.com/Ouranosinc/PAVICS-landing/blob/master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb for bokeh visualization performance and it looks fine.
+- Jenkins build, all passed:
+  - To upload `job-PAVICS-e2e-workflow-tests-new-docker-build-###-consoleText.txt`
+  - To upload `ravenpy-job-PAVICS-e2e-workflow-tests-new-docker-build-###-consoleText.txt`
+
 
 ## Related Issue / Discussion
 
-- Resolves ...
+- Matching notebook fixes:
+  - Pavics-sdi: PR url
+  - Finch: PR url
+  - PAVICS-landing: PR url
+  - RavenPy: PR url
+  - (...)
+
+- Deployment to PAVICS: PR url
+
+- Jenkins-config changes for new notebooks: PR url
+
+- Other issues found while working on this one
+  - Issue 1 URL
+  - Issue 2 URL
+  - (...)
+
+- Previous release: PR url
+
 
 ## Additional Information
 
-Links to other issues or sources.
+Full diff conda env export:
+To upload `OLD_TAG-NEW_TAG-conda-env-export.diff.txt`
+
+Full new conda env export:
+To upload `NEW_TAG-conda-env-export.yml.txt`
 
-- [ ] Things to do...
+DockerHub build log
+To upload `NEW_TAG-buildlogs.txt`

Jenkinsfile

@@ -10,7 +10,7 @@ pipeline {
     // https://jenkins.io/doc/book/pipeline/syntax/
     agent {
         docker {
-            image "pavics/workflow-tests:230601"
+            image "pavics/workflow-tests:py39-230601-1-update231025"
             label 'linux && docker'
         }
     }
@@ -71,7 +71,7 @@ Requires 'weaver' component to be active on the target 'PAVICS_HOST' server
                description: 'https://github.com/Ouranosinc/PAVICS-landing repo or fork to test against.', trim: true)
         booleanParam(name: 'TEST_RAVEN_REPO', defaultValue: false,
                      description: 'Check the box to test raven repo.')
-        string(name: 'RAVEN_BRANCH', defaultValue: 'master',
+        string(name: 'RAVEN_BRANCH', defaultValue: 'main',
                description: 'RAVEN_REPO branch to test against.', trim: true)
         string(name: 'RAVEN_REPO', defaultValue: 'Ouranosinc/raven',
                description: 'https://github.com/Ouranosinc/raven repo or fork to test against.', trim: true)

binder/Dockerfile

@@ -1,4 +1,4 @@
-FROM pavics/workflow-tests:230601
+FROM pavics/workflow-tests:py39-230601-1-update231025
 
 USER root
 

default_build_params

@@ -71,7 +71,7 @@ else
 fi
 
 if [ -z "$RAVEN_BRANCH" ]; then
-    RAVEN_BRANCH=master
+    RAVEN_BRANCH=main
     echo "RAVEN_BRANCH not set, default to '$RAVEN_BRANCH'"
 else
     echo "RAVEN_BRANCH has been set to '$RAVEN_BRANCH'"

docker/Dockerfile.testing

@@ -1,6 +1,6 @@
 # For testing quickly without having to do a full rebuild.
 
-FROM pavics/workflow-tests:230530-1
+FROM pavics/workflow-tests:py39-230601-1
 
 #ENV ESMFMKFILE="/opt/conda/envs/birdy/lib/esmf.mk"
 
@@ -11,7 +11,7 @@ USER root
 # Use 'update' for existing and 'install' for new package.
 # Keep same channel ordering to not revert anything.
 RUN umask 0000 \
-    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c pyviz/label/dev -c defaults -n birdy ravenpy==0.12.1 \
+    && 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 \
 #    && mamba install -c conda-forge -c cdat -c bokeh -c plotly -c defaults -n birdy ravenpy aiohttp

docker/environment.yml

@@ -127,6 +127,9 @@ dependencies:
   # https://github.com/pangeo-data/xESMF
   # xesmf-0.6.2 requires clisops>=0.8.0
   - xesmf >= 0.6.2
+  # Sensitivity Analysis Library
+  # https://anaconda.org/conda-forge/salib
+  - salib
   # https://anaconda.org/conda-forge/geopy
   - geopy
   # https://anaconda.org/anaconda/memory_profiler

launchcontainer

@@ -1,7 +1,7 @@
 #!/bin/sh -x
 
 if [ -z "$DOCKER_IMAGE" ]; then
-    DOCKER_IMAGE="pavics/workflow-tests:230601"
+    DOCKER_IMAGE="pavics/workflow-tests:py39-230601-1-update231025"
 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:230601"
+    DOCKER_IMAGE="pavics/workflow-tests:py39-230601-1-update231025"
 fi
 
 if [ -z "$CONTAINER_NAME" ]; then