Skip to content
Snippets Groups Projects
Commit 596e4b1a authored by Jeremy Auguste's avatar Jeremy Auguste
Browse files

Compatiblity fix for python < 3.6

parent a9b38c5a
No related branches found
No related tags found
No related merge requests found
...@@ -71,22 +71,22 @@ def load_flags(yaml_flags, args): ...@@ -71,22 +71,22 @@ def load_flags(yaml_flags, args):
def load_job(job_name, job, var_names, var_tuples, constants, flags, precommand): def load_job(job_name, job, var_names, var_tuples, constants, flags, precommand):
for name, value in constants.items(): for name, value in constants.items():
job = job.replace(f"${name}$", str(value)) job = job.replace("${}$".format(name), str(value))
job_name = job_name.replace(f"${name}$", str(value)) job_name = job_name.replace("${}$".format(name), str(value))
for flag, str_flag in flags.items(): for flag, str_flag in flags.items():
job = job.replace(f"@{flag}@", str_flag) job = job.replace("@{}@".format(flag), str_flag)
job_name = job_name.replace(f"@{flag}@", str_flag) job_name = job_name.replace("@{}@".format(flag), str_flag)
if precommand: if precommand:
job = f"{precommand} {job}" job = "{} {}".format(precommand, job)
jobs = [] jobs = []
for var_tuple in var_tuples: for var_tuple in var_tuples:
new_job = job new_job = job
new_job_name = job_name new_job_name = job_name
for var_name, var in zip(var_names, var_tuple): for var_name, var in zip(var_names, var_tuple):
new_job = new_job.replace(f"%{var_name}%", str(var)) new_job = new_job.replace("%{}%".format(var_name), str(var))
new_job_name = new_job_name.replace(f"%{var_name}%", str(var)) new_job_name = new_job_name.replace("%{}%".format(var_name), str(var))
jobs.append((new_job_name, new_job)) jobs.append((new_job_name, new_job))
return jobs return jobs
...@@ -158,7 +158,7 @@ def main(): ...@@ -158,7 +158,7 @@ def main():
elif args.run: elif args.run:
logging.warning("Job '{}' didn't return anything...".format(job_name)) logging.warning("Job '{}' didn't return anything...".format(job_name))
else: else:
fake_id = f"FAKE_ID_{fake_id_counter}" fake_id = "FAKE_ID_{}".format(fake_id_counter)
fake_id_counter += 1 fake_id_counter += 1
anteriors.appendleft(fake_id) anteriors.appendleft(fake_id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment