Merge pull request #66 from coecms/stable_to_2310

Update stable to 23.10 and unstable to 24.01

environments/analysis3/config.sh

@@ -9,8 +9,8 @@
 
 ### Optional config for custom deploy script
 export VERSION_TO_MODIFY=24.01
-export STABLE_VERSION=23.07
-export UNSTABLE_VERSION=23.10
+export STABLE_VERSION=23.10
+export UNSTABLE_VERSION=24.01
 
 ### Version settings
 export ENVIRONMENT=analysis3

environments/analysis3/environment.yml

@@ -284,5 +284,6 @@ dependencies:
 - pdbufr
 - matplotlib-scalebar
 - python-kaleido
+- numba<0.59 ### pysal -> giddy -> quantecon is broken with numba 0.59
 - pip:
   - railroad-diagrams ### Unlisted dependency of pip and pyparsing

scripts/functions.sh

@@ -207,11 +207,20 @@ function initialise_tmp_dirs() {
     if [[ "${PBS_JOBFS}" ]]; then
         relink_cmds=""
         for dir in "$@"; do
-            relink_cmds="${relink_cmds}rm ~/${dir}; ln -s $( readlink ~/${dir} ) ~/${dir}; "
-            rm ~/"${dir}"
-            mkdir -p "${PBS_JOBFS}"/"${dir}"
-            ln -s "${PBS_JOBFS}"/"${dir}" ~
-            ### Race condition
+            if [[ -h ~/"${dir}" ]]; then
+                relink_cmds="${relink_cmds}rm ~/${dir}; ln -s $( readlink ~/${dir} ) ~/${dir}; "
+                rm ~/"${dir}"
+                mkdir -p "${PBS_JOBFS}"/"${dir}"
+                ln -s "${PBS_JOBFS}"/"${dir}" ~
+                ### Race condition
+            elif [[ -d ~/"${dir}" ]]; then
+                echo "Warning! ~/${dir} is a directory (not a symlink). This can significantly increase "
+                echo "installation time of conda environments."
+            else
+                relink_cmds="${relink_cmds}rm ~/${dir}; "
+                mkdir -p "${PBS_JOBFS}"/"${dir}"
+                ln -s "${PBS_JOBFS}"/"${dir}" ~
+            fi
         done
         trap "${relink_cmds}" EXIT
     fi