From 32f4add202e0aa9ed70c3fa86966885cbf8db432 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Fri, 4 Feb 2022 20:40:23 +0000
Subject: [PATCH] add missing imports
---
binarycpython/utils/functions.py | 3 +++
binarycpython/utils/population_extensions/condor.py | 6 +++++-
.../utils/population_extensions/grid_options_defaults.py | 1 -
binarycpython/utils/population_extensions/slurm.py | 4 ++++
4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/binarycpython/utils/functions.py b/binarycpython/utils/functions.py
index d4aa94fcd..2b3013ad9 100644
--- a/binarycpython/utils/functions.py
+++ b/binarycpython/utils/functions.py
@@ -1217,4 +1217,7 @@ def quotewrap(list):
return ['"' + _x + '"' for _x in list]
def command_string_from_list(list):
+ """
+ Given a list, turn it into a quoted command string
+ """
return ' '.join(quotewrap(list))
diff --git a/binarycpython/utils/population_extensions/condor.py b/binarycpython/utils/population_extensions/condor.py
index 3ea970fb5..c57a992b1 100644
--- a/binarycpython/utils/population_extensions/condor.py
+++ b/binarycpython/utils/population_extensions/condor.py
@@ -17,6 +17,10 @@ import pathlib
import datasize
import lib_programname
+from binarycpython.utils.functions import (
+ command_string_from_list,
+ now,
+)
class condor:
@@ -308,7 +312,7 @@ class condor:
]
)
- grid_command = " ".join(grid_command)
+ grid_command = command_string_from_list(grid_command)
# make condor script paths
submit_script_path = self.condorpath("condor_submit_script")
diff --git a/binarycpython/utils/population_extensions/grid_options_defaults.py b/binarycpython/utils/population_extensions/grid_options_defaults.py
index bb6b7b0d6..99e363097 100644
--- a/binarycpython/utils/population_extensions/grid_options_defaults.py
+++ b/binarycpython/utils/population_extensions/grid_options_defaults.py
@@ -22,7 +22,6 @@ import shutil
import sys
from binarycpython.utils.custom_logging_functions import temp_dir
-
from binarycpython.utils.functions import (
command_string_from_list,
now,
diff --git a/binarycpython/utils/population_extensions/slurm.py b/binarycpython/utils/population_extensions/slurm.py
index ec5040c2a..583651880 100644
--- a/binarycpython/utils/population_extensions/slurm.py
+++ b/binarycpython/utils/population_extensions/slurm.py
@@ -15,6 +15,10 @@ import subprocess
import datasize
import lib_programname
+from binarycpython.utils.functions import (
+ command_string_from_list,
+ now,
+)
class slurm:
--
GitLab