Merge branch 'fix/report_partition' into 'master'

Fix / report partition same as action slurm partition

See merge request detectors/pycalibration!606

src/xfel_calibrate/calibrate.py

@@ -225,7 +225,8 @@ def create_finalize_script(fmt_args, temp_path, job_list) -> str:
     return f_name
 
 
-def run_finalize(fmt_args, temp_path, job_list, sequential=False):
+def run_finalize(
+    fmt_args, temp_path, job_list, sequential=False, partition="exfel"):
     finalize_script = create_finalize_script(fmt_args, temp_path, job_list)
 
     cmd = []
@@ -238,7 +239,7 @@ def run_finalize(fmt_args, temp_path, job_list, sequential=False):
             '--open-mode=append',  # So we can see if it's preempted & requeued
             '--job-name', 'xfel-cal-finalize',
             '--time', finalize_time_limit,
-            '--partition', 'upex-middle',
+            '--partition', partition,
             "--dependency=afterany:" + ":".join(str(j) for j in job_list),
         ]
         print(" ".join(cmd))
@@ -848,7 +849,7 @@ def run(argv=None):
                 'report_to': report_to,
                 'in_folder': folder,
                 'request_time': request_time,
-                'submission_time': submission_time
+                'submission_time': submission_time,
                 }
 
     joblist.append(run_finalize(
@@ -856,6 +857,7 @@ def run(argv=None):
         temp_path=run_tmp_path,
         job_list=joblist,
         sequential=args["no_cluster_job"],
+        partition=args["slurm_partition"] or "exfel",
     ))
 
     if any(j is not None for j in joblist):

src/xfel_calibrate/repeat.py

@@ -93,6 +93,7 @@ def main(argv=None):
         temp_path=working_dir,
         job_list=joblist,
         sequential=args.no_cluster_job,
+        partition=args.slurm_partition
     ))
 
     if any(j is not None for j in joblist):