From 06140a1b1e689ebe3375ffa2d3e34e7db3828f9f Mon Sep 17 00:00:00 2001
From: Mark Melotto <70904313+MarkMelotto@users.noreply.github.com>
Date: Thu, 11 Dec 2025 08:34:18 +0100
Subject: [PATCH 1/2] Add folium and geopandas to environment.yml.j2

---
 roles/ewatercycle/templates/environment.yml.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/ewatercycle/templates/environment.yml.j2 b/roles/ewatercycle/templates/environment.yml.j2
index a15ccd46..3d91690e 100644
--- a/roles/ewatercycle/templates/environment.yml.j2
+++ b/roles/ewatercycle/templates/environment.yml.j2
@@ -21,6 +21,8 @@ dependencies:
       # Conda version of papermill is not py3.12 compat, so use pip version
       - papermill==2.6.0
       - rich==13.9.4
+      - folium==0.20.0
+      - geopandas==1.1.1
   # Pangeo deps, see https://pangeo.io/setup_guides/hpc.html
   # TODO add pangeo deps back?
 

From 00d417b95828af3bdb23fac11800296664de6dbf Mon Sep 17 00:00:00 2001
From: Mark Melotto <70904313+MarkMelotto@users.noreply.github.com>
Date: Wed, 17 Dec 2025 14:04:26 +0100
Subject: [PATCH 2/2] move folium and geopandas in environment.yml.j2

Re-add folium and geopandas dependencies to the environment.
---
 roles/ewatercycle/templates/environment.yml.j2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/ewatercycle/templates/environment.yml.j2 b/roles/ewatercycle/templates/environment.yml.j2
index 3d91690e..5e5b70ea 100644
--- a/roles/ewatercycle/templates/environment.yml.j2
+++ b/roles/ewatercycle/templates/environment.yml.j2
@@ -21,8 +21,6 @@ dependencies:
       # Conda version of papermill is not py3.12 compat, so use pip version
       - papermill==2.6.0
       - rich==13.9.4
-      - folium==0.20.0
-      - geopandas==1.1.1
   # Pangeo deps, see https://pangeo.io/setup_guides/hpc.html
   # TODO add pangeo deps back?
 
@@ -36,6 +34,8 @@ dependencies:
   - ipynb-py-convert=0.4.6
   - jupyterhub-idle-culler=1.3.1
   - nodejs=22.7.0
+  - folium==0.20.0
+  - geopandas==1.1.1
   # JupyterLab extensions server dependencies, lab extension should be added to defaults of jupyter role
   - jupyterlab_code_formatter=3.0.2
   - black=24.8.0
@@ -49,4 +49,4 @@ dependencies:
   - nbgrader=0.9.3
   # Needed for running playbooks, as after initial provision the conda env is the default python
   - ansible=10.4.0
-  - passlib=1.7.4
+  - passlib=1.7.4