Merge pull request #153 from eWaterCycle/fix-wflowjl-environment

Wflow.jl fix: pin packages depending on netcdf/h5 binaries
eWaterCycle · Nov 5, 2023 · 8d65b35 · 8d65b35
2 parents 9ed8852 + d520e47
commit 8d65b35
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/roles/ewatercycle/defaults/main.yml b/roles/ewatercycle/defaults/main.yml
@@ -2,7 +2,7 @@
 # Location where conda is installed
 conda_root: /opt/conda
 # Name of conda environment to use
-conda_environment: ewatercycle
+conda_environment: ewatercycle2
 # Path to conda environments bin directory
 conda_environment_bin: '{{ conda_root }}/envs/{{ conda_environment }}/bin'
 # Where all shared data is available

diff --git a/roles/ewatercycle/templates/environment.yml.j2 b/roles/ewatercycle/templates/environment.yml.j2
@@ -6,6 +6,9 @@ channels:
 dependencies:
   # TODO pin versions for reproducibility. Use `conda env export` and `pip list` to get versions
   - python=3.10
+  - esmpy==8.3.1  # For juliacall compatibility
+  - fiona==1.9.1  # For juliacall compatibility
+  - netcdf4==1.6.2  # For juliacall compatibility
   - esmvaltool-python>=2.3.0
   - ansible
   - pip:
@@ -24,7 +27,7 @@ dependencies:
       # For using ewatercycle-wflowjl
       # pyjuliapkg fork that accepts ~
       - git+https://github.com/eWaterCycle/pyjuliapkg@expanduser
-      - juliacall
+      - juliacall==0.9.14
   - setuptools
   - altair_saver
   - altair

diff --git a/roles/jupyter/defaults/main.yml b/roles/jupyter/defaults/main.yml
@@ -17,7 +17,7 @@ jupyterhub_spawner_environment:
 # Location where conda is installed
 conda_root: /opt/conda
 # Name of conda environment to use
-conda_environment: ewatercycle
+conda_environment: ewatercycle2
 # Path to conda environments bin directory
 conda_environment_bin: '{{ conda_root }}/envs/{{ conda_environment }}/bin'
 # List of posix users who should have JupyterHub admin rights

diff --git a/roles/jupyter/tasks/main.yml b/roles/jupyter/tasks/main.yml
@@ -47,7 +47,7 @@
   notify:
     - restart jupyterhub
 - name: Remove default conda python kernel
-  command: /mnt/apps/conda/envs/ewatercycle/bin/jupyter kernelspec remove -f conda
+  command: '{{ conda_environment_bin }}/bin/jupyter kernelspec remove -f conda'
   args:
     removes: /usr/local/share/jupyter/kernels/conda
   notify: