From ca02c87494796ecd300769162b558af9fc2c9771 Mon Sep 17 00:00:00 2001
From: Dale Roberts <dsroberts@unimelb.edu.au>
Date: Wed, 29 Nov 2023 11:44:28 +1100
Subject: [PATCH] Revert bokeh to 3.2.2 to fix dask dashboard. Remove incorrect
 quotes around overlay_args in launcher

---
 scripts/environment.yml | 2 +-
 scripts/launcher.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/environment.yml b/scripts/environment.yml
index 91aa2c7..db15900 100644
--- a/scripts/environment.yml
+++ b/scripts/environment.yml
@@ -35,7 +35,7 @@ dependencies:
 - windspharm
 - python-cdo
 - arm_pyart
-- bokeh!=3.0.*,>=2.4.2 ### Dask needs bokeh!=3.0.*,>=2.4.2 for the dashboard.
+- bokeh<3.3.0 ### https://github.com/dask/distributed/issues/8333
 - datashader
 - f90nml
 - wrf-python
diff --git a/scripts/launcher.sh b/scripts/launcher.sh
index ffbd740..06bea13 100755
--- a/scripts/launcher.sh
+++ b/scripts/launcher.sh
@@ -125,4 +125,4 @@ for bind_dir in "${bind_dirs[@]}"; do
 done
 bind_str=${bind_str%,}
 
-"$SINGULARITY_BINARY_PATH" -s exec --bind "${bind_str}" "${overlay_args}" "${CONTAINER_PATH}" "${cmd_to_run[@]}"
+"$SINGULARITY_BINARY_PATH" -s exec --bind "${bind_str}" ${overlay_args} "${CONTAINER_PATH}" "${cmd_to_run[@]}"