diff --git a/binarycpython/utils/population_extensions/HPC.py b/binarycpython/utils/population_extensions/HPC.py
index 3d3c84011490799bcd67e4252b4014e4ab1415fb..ec26ef5a0bc252218a694de7d09e39528d4635c4 100644
--- a/binarycpython/utils/population_extensions/HPC.py
+++ b/binarycpython/utils/population_extensions/HPC.py
@@ -682,11 +682,11 @@ class HPC(condor, slurm):
# print("HPC get job",_id,':',i," status=",s)
if s is None:
s = "unknown"
- if not s in d["status"]:
+ if s not in d["status"]:
d["status"][s] = 1
else:
d["status"][s] += 1
- if not s in d["joblist"]:
+ if s not in d["joblist"]:
d["joblist"][s] = [str(_id) + "." + str(i)]
else:
d["joblist"][s] += [str(_id) + "." + str(i)]
diff --git a/binarycpython/utils/population_extensions/dataIO.py b/binarycpython/utils/population_extensions/dataIO.py
index 273c1069a2d4a4c170b44f9f39eb84b93a0ee4bf..8fecb6590eefac7bbd7450d2d96ac58bcdad5f05 100644
--- a/binarycpython/utils/population_extensions/dataIO.py
+++ b/binarycpython/utils/population_extensions/dataIO.py
@@ -19,8 +19,7 @@ import flufl.lock
import msgpack
from binarycpython.utils.dicts import merge_dicts
-from binarycpython.utils.ensemble import (ensemble_compression,
- ensemble_file_type)
+from binarycpython.utils.ensemble import (ensemble_file_type)
from binarycpython.utils.functions import now, verbose_print
@@ -103,7 +102,7 @@ class dataIO:
population_object.persistent_data_memory_dict = None
# add metadata if it doesn't exist
- if not "metadata" in population_object.grid_ensemble_results:
+ if "metadata" not in population_object.grid_ensemble_results:
population_object.grid_ensemble_results["metadata"] = {}
# add datestamp
diff --git a/binarycpython/utils/population_extensions/evolution_functions.py b/binarycpython/utils/population_extensions/evolution_functions.py
index 340894d14b92f8e4fa8b6d4caa99c2677bd057a1..a36bdff1ef8fbc732aa6770ff870af7e73566d05 100644
--- a/binarycpython/utils/population_extensions/evolution_functions.py
+++ b/binarycpython/utils/population_extensions/evolution_functions.py
@@ -122,8 +122,8 @@ class evolution_functions:
)
# Some information on where we logged the systems
if (
- self.grid_options["log_failed_systems"] == True
- and self.grid_options["log_failed_systems_dir"] != None
+ self.grid_options["log_failed_systems"]
+ and self.grid_options["log_failed_systems_dir"] is not None
):
self.verbose_print(
@@ -459,7 +459,7 @@ class evolution_functions:
# Set up logging
stream_logger = self._get_stream_logger()
if self.grid_options["verbosity"] >= self._LOGGER_VERBOSITY_LEVEL:
- stream_logger.debug(f"setting up the system_queue_filler now")
+ stream_logger.debug("setting up the system_queue_filler now")
#######
# Start up the generator
@@ -558,7 +558,7 @@ class evolution_functions:
# Put system in the job queue
try:
job_queue.put((system_number, system_dict), block=True)
- except Exception as e:
+ except Exception:
# error on queueing : stop the queue
self.grid_options["stop_queue"] = True
@@ -571,7 +571,7 @@ class evolution_functions:
########
# Handle stopping
- if self.grid_options["_queue_done"] == True:
+ if self.grid_options["_queue_done"]:
break
# Signal queue is done
@@ -584,7 +584,7 @@ class evolution_functions:
job_queue.put("STOP")
if self.grid_options["verbosity"] >= self._LOGGER_VERBOSITY_LEVEL:
- stream_logger.debug(f"Signalling processes to stop") # DEBUG
+ stream_logger.debug("Signalling processes to stop") # DEBUG
def _process_queue(self, job_queue, result_queue, final_result_queue, ID):
"""
diff --git a/binarycpython/utils/population_extensions/failing_systems_functions.py b/binarycpython/utils/population_extensions/failing_systems_functions.py
index 3521bba8d9d2686d845e4a89a96069540ac009c1..bf8a0b9c664776eaaa3a42e999e23a79c64be4ad 100644
--- a/binarycpython/utils/population_extensions/failing_systems_functions.py
+++ b/binarycpython/utils/population_extensions/failing_systems_functions.py
@@ -26,8 +26,8 @@ class failing_systems_functions:
"""
if (
- self.grid_options["log_failed_systems"] == True
- and self.grid_options["log_failed_systems_dir"] != None
+ self.grid_options["log_failed_systems"]
+ and self.grid_options["log_failed_systems_dir"] is not None
):
path = os.path.join(self.grid_options["log_failed_systems_dir"])
os.makedirs(path, exist_ok=True)
@@ -105,7 +105,7 @@ class failing_systems_functions:
)
if (
- not error_code
+ error_code not
in self.grid_options["_failed_systems_error_codes"]
):
print(f"Caught errr code {error_code}")
diff --git a/binarycpython/utils/population_extensions/slurm.py b/binarycpython/utils/population_extensions/slurm.py
index 958e233f2d7d5942f4eb81e581bc5ebe71ed6e2e..692b1a25c312eadd45ab91c9729837f873e02d2b 100644
--- a/binarycpython/utils/population_extensions/slurm.py
+++ b/binarycpython/utils/population_extensions/slurm.py
@@ -16,7 +16,7 @@ import time
import datasize
import lib_programname
-from binarycpython.utils.functions import command_string_from_list, now
+from binarycpython.utils.functions import command_string_from_list
class slurm:
@@ -271,14 +271,6 @@ class slurm:
max_jobs=self.grid_options["slurm_array_max_jobs"],
)
- # get job id (might be passed in)
- # TODO: is this variable used?
- jobid = (
- self.grid_options["slurm_jobid"]
- if self.grid_options["slurm_jobid"] != ""
- else "$SLURM_ARRAY_JOB_ID"
- )
-
# get job array index
jobarrayindex = self.grid_options["slurm_jobarrayindex"]
if jobarrayindex is None: