From de55c82f744490c2fc64c75c796f368005769198 Mon Sep 17 00:00:00 2001
From: David Huard <huard.david@ouranos.ca>
Date: Wed, 30 Nov 2022 15:44:04 -0500
Subject: [PATCH 1/3] Add urlpath to environment

---
 docker/environment.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/environment.yml b/docker/environment.yml
index 1beff44..32e7513 100644
--- a/docker/environment.yml
+++ b/docker/environment.yml
@@ -209,3 +209,4 @@ dependencies:
     # Needed to run notebook tests.  Missing indirect recursive dependencies
     # somewhere, should not need to manually add it here.
     - pytest-tornasync
+    - urlpath

From 4147cc55733e9e66bdb23cc3e732627583d69059 Mon Sep 17 00:00:00 2001
From: Long Vu <vu.long@ouranos.ca>
Date: Wed, 30 Nov 2022 17:05:45 -0500
Subject: [PATCH 2/3] docker: use conda flavor of urlpath

Conda handles larger set of dependencies than Pip so we try to stick
with Conda when we can.

Needed for the new eccc-geoapi-climate-stations.ipynb and
eccc-geoapi-xclim.ipynb from pavics-sdi repo.

See https://github.com/Ouranosinc/pavics-sdi/pull/268
---
 docker/environment.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/environment.yml b/docker/environment.yml
index 32e7513..87e7b02 100644
--- a/docker/environment.yml
+++ b/docker/environment.yml
@@ -176,6 +176,9 @@ dependencies:
   - curl
   - wget
   - nested_dict
+  # https://anaconda.org/conda-forge/urlpath
+  # https://github.com/brandonschabell/urlpath
+  - urlpath
   - paramiko
   - pymetalink  # for Raven notebook Extract_geographical_watershed_properties.ipynb
   - requests-magpie
@@ -209,4 +212,3 @@ dependencies:
     # Needed to run notebook tests.  Missing indirect recursive dependencies
     # somewhere, should not need to manually add it here.
     - pytest-tornasync
-    - urlpath

From eb2049de269c8fa20bed34d040a267a0286501c5 Mon Sep 17 00:00:00 2001
From: Long Vu <vu.long@ouranos.ca>
Date: Wed, 30 Nov 2022 18:17:01 -0500
Subject: [PATCH 3/3] release: update to use image pavics/workflow-tests:221130

---
 Jenkinsfile       | 2 +-
 binder/Dockerfile | 2 +-
 launchcontainer   | 2 +-
 launchnotebook    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5820e39..9f9b0af 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
     // https://jenkins.io/doc/book/pipeline/syntax/
     agent {
         docker {
-            image "pavics/workflow-tests:221118.1"
+            image "pavics/workflow-tests:221130"
             label 'linux && docker'
         }
     }
diff --git a/binder/Dockerfile b/binder/Dockerfile
index d870a65..19bc1bf 100644
--- a/binder/Dockerfile
+++ b/binder/Dockerfile
@@ -1,4 +1,4 @@
-FROM pavics/workflow-tests:221118.1
+FROM pavics/workflow-tests:221130
 
 USER root
 
diff --git a/launchcontainer b/launchcontainer
index 12cc4ce..ace0595 100755
--- a/launchcontainer
+++ b/launchcontainer
@@ -1,7 +1,7 @@
 #!/bin/sh -x
 
 if [ -z "$DOCKER_IMAGE" ]; then
-    DOCKER_IMAGE="pavics/workflow-tests:221118.1"
+    DOCKER_IMAGE="pavics/workflow-tests:221130"
 fi
 
 if [ -z "$CONTAINER_NAME" ]; then
diff --git a/launchnotebook b/launchnotebook
index 4300319..e899603 100755
--- a/launchnotebook
+++ b/launchnotebook
@@ -7,7 +7,7 @@ if [ -z "$PORT" ]; then
 fi
 
 if [ -z "$DOCKER_IMAGE" ]; then
-    DOCKER_IMAGE="pavics/workflow-tests:221118.1"
+    DOCKER_IMAGE="pavics/workflow-tests:221130"
 fi
 
 if [ -z "$CONTAINER_NAME" ]; then