From 709eaf16abf33d3f927b88a08003c25b62b27f7d Mon Sep 17 00:00:00 2001
From: jchen6727 <jchen.6727@gmail.com>
Date: Tue, 17 Sep 2024 10:33:10 -0400
Subject: [PATCH] d/w expanse setup, moved {env} {res} {custom} (#834)

feedback for expanse scripts, moved {env} {res} {custom}, removed the source ./bashrc since that can be handled in {custom}

also note-- new test for 3.7 failing d/t external error "functools" import
---
 netpyne/batchtools/search.py  |  1 +
 netpyne/batchtools/submits.py | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/netpyne/batchtools/search.py b/netpyne/batchtools/search.py
index 93a52cc05..79045706b 100644
--- a/netpyne/batchtools/search.py
+++ b/netpyne/batchtools/search.py
@@ -225,6 +225,7 @@ def run(config):
     ('sh', 'sfs' ): constructors(runtk.dispatchers.SFSDispatcher , submits.SHSubmitSFS),
 }#TODO, just say "socket"?
 
+
 """
 some shim functions before ray_search
 """
diff --git a/netpyne/batchtools/submits.py b/netpyne/batchtools/submits.py
index ad033f188..587843a37 100644
--- a/netpyne/batchtools/submits.py
+++ b/netpyne/batchtools/submits.py
@@ -179,9 +179,8 @@ class SlurmSubmit(Submit):
 #SBATCH --mail-user={email}
 #SBATCH --mail-type=end
 export JOBID=$SLURM_JOB_ID
-{res}
+{env}
 {custom}
-source ~/.bashrc
 cd {project_path}
 {command}
 wait
@@ -227,8 +226,8 @@ class SlurmSubmitSFS(SlurmSubmit):
 export JOBID=$SLURM_JOB_ID
 export OUTFILE="{output_path}/{label}.out"
 export SGLFILE="{output_path}/{label}.sgl"
+{env}
 {custom}
-source ~/.bashrc
 cd {project_path}
 {command}
 wait
@@ -254,8 +253,8 @@ class SlurmSubmitSOCK(SlurmSubmit):
 #SBATCH --mail-type=end
 export JOBID=$SLURM_JOB_ID
 export SOCNAME="{sockname}"
+{env}
 {custom}
-source ~/.bashrc
 cd {project_path}
 {command}
 wait
@@ -263,4 +262,5 @@ class SlurmSubmitSOCK(SlurmSubmit):
     script_handles = {runtk.SUBMIT: '{output_path}/{label}.sh',
                       runtk.STDOUT: '{output_path}/{label}.run',
                       runtk.SOCKET: '{sockname}'
-                      }
\ No newline at end of file
+                      }
+