From e43732383d4d6bbcdf894b226c628ca3f3781319 Mon Sep 17 00:00:00 2001 From: "Joseph M. Koning" Date: Fri, 22 Sep 2023 13:17:21 -0700 Subject: [PATCH] Run fix-style --- merlin/spec/specification.py | 4 ++-- merlin/study/script_adapter.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/merlin/spec/specification.py b/merlin/spec/specification.py index 0448eaa01..f808bcb67 100644 --- a/merlin/spec/specification.py +++ b/merlin/spec/specification.py @@ -371,9 +371,9 @@ def process_spec_defaults(self): MerlinSpec.fill_missing_defaults(step["run"], defaults.STUDY_STEP_RUN) # Insert VLAUNCHER specific variables if necessary if "$(VLAUNCHER)" in step["run"]["cmd"]: - SHSET="" + SHSET = "" if "csh" in step["run"]["shell"]: - SHSET="set " + SHSET = "set " for vlaunch_var, vlaunch_val in defaults.VLAUNCHER_VARS.items(): if vlaunch_var not in step["run"]["cmd"]: step["run"]["cmd"] = f"{SHSET}{vlaunch_var}={vlaunch_val}\n" + step["run"]["cmd"] diff --git a/merlin/study/script_adapter.py b/merlin/study/script_adapter.py index 398d43357..4265a36cc 100644 --- a/merlin/study/script_adapter.py +++ b/merlin/study/script_adapter.py @@ -228,7 +228,7 @@ class but will eventually call it. This is necessary for the VLAUNCHER to work. - a path to the script for the cmd - a path to the script for the restart cmd """ - setup_vlaunch(step.run, "lsf" , False) + setup_vlaunch(step.run, "lsf", False) return super().write_script(ws_path, step) @@ -345,7 +345,7 @@ class but will eventually call it. This is necessary for the VLAUNCHER to work. - a path to the script for the cmd - a path to the script for the restart cmd """ - setup_vlaunch(step.run, "slurm" , False) + setup_vlaunch(step.run, "slurm", False) return super().write_script(ws_path, step) @@ -425,7 +425,7 @@ class but will eventually call it. This is necessary for the VLAUNCHER to work. - a path to the script for the cmd - a path to the script for the restart cmd """ - setup_vlaunch(step.run, "flux" , True) + setup_vlaunch(step.run, "flux", True) return super().write_script(ws_path, step)