Skip to content

Commit

Permalink
pep8 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
bhilbert4 committed Sep 25, 2023
1 parent 2f0e825 commit 55b12f3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion jwql/shared_tasks/run_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ def run_save_jump(input_file, short_name, work_directory, instrument, ramp_fit=T
outputs = args.outputs
step_args = args.step_args

status_file = os.path.join(working_path, short_name+"_status.txt")
status_file = os.path.join(working_path, short_name + "_status.txt")
with open(status_file, 'w') as out_file:
out_file.write("Starting Process\n")
out_file.write("\tpipeline is {} ({})\n".format(pipe_type, type(pipe_type)))
Expand Down
19 changes: 10 additions & 9 deletions jwql/shared_tasks/shared_tasks.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python

"""This module contains code for the celery application, which is used for any demanding
work which should be restricted in terms of how many iterations are run simultaneously, or
Expand Down Expand Up @@ -204,7 +204,7 @@ def log_subprocess_output(pipe):
If a subprocess STDOUT has been set to subprocess.PIPE, this function will log each
line to the logging output.
"""
for line in iter(pipe.readline, b''): # b'\n'-separated lines
for line in iter(pipe.readline, b''): # b'\n'-separated lines
logging.info("\t{}".format(line.decode('UTF-8').strip()))


Expand All @@ -224,6 +224,7 @@ def after_setup_celery_logger(logger, **kwargs):
def collect_after_task(**kwargs):
gc.collect()


def convert_step_args_to_string(args_dict):
"""Convert the nested dictionary containing pipeline step parameter keyword/value pairs
to a string so that it can be passed via command line
Expand All @@ -239,17 +240,17 @@ def convert_step_args_to_string(args_dict):
args_str : str
String representation of ``args_dict``
"""
args_str="'{"
args_str = "'{"

for i, step in enumerate(args_dict):
args_str += f'"{step}":'
args_str += '{'
for j, (param, val) in enumerate(args_dict[step].items()):
args_str += f'"{param}":"{val}"'
if j < len(args_dict[step])-1:
if j < len(args_dict[step]) - 1:
args_str += ', '
args_str += "}"
if i < len(args_dict)-1:
if i < len(args_dict) - 1:
args_str += ','
args_str += "}'"
return args_str
Expand Down Expand Up @@ -331,7 +332,7 @@ def run_calwebb_detector1(input_file_name, short_name, ext_or_exts, instrument,
current_dir = os.path.dirname(__file__)
cmd_name = os.path.join(current_dir, "run_pipeline.py")
outputs = ",".join(ext_or_exts)
result_file = os.path.join(cal_dir, short_name+"_status.txt")
result_file = os.path.join(cal_dir, short_name + "_status.txt")
if "all" in ext_or_exts:
logging.info("All outputs requested")
if instrument.lower() != 'miri':
Expand Down Expand Up @@ -399,7 +400,7 @@ def run_calwebb_detector1(input_file_name, short_name, ext_or_exts, instrument,
set_permissions(os.path.join(output_dir, file))

logging.info("Removing local files.")
files_to_remove = glob(os.path.join(cal_dir, short_name+"*"))
files_to_remove = glob(os.path.join(cal_dir, short_name + "*"))
for file_name in files_to_remove:
logging.info("\tRemoving {}".format(file_name))
os.remove(file_name)
Expand Down Expand Up @@ -472,7 +473,7 @@ def calwebb_detector1_save_jump(input_file_name, instrument, ramp_fit=True, save
output_dir = os.path.join(config["transfer_dir"], "outgoing")

cmd_name = os.path.join(os.path.dirname(__file__), "run_pipeline.py")
result_file = os.path.join(cal_dir, short_name+"_status.txt")
result_file = os.path.join(cal_dir, short_name + "_status.txt")

cores = 'all'
status = run_subprocess(cmd_name, "jump", "all", cal_dir, instrument, input_file,
Expand Down Expand Up @@ -531,7 +532,7 @@ def calwebb_detector1_save_jump(input_file_name, instrument, ramp_fit=True, save
files["fitopt_output"] = os.path.join(output_dir, file)

logging.info("Removing local files.")
files_to_remove = glob(os.path.join(cal_dir, short_name+"*"))
files_to_remove = glob(os.path.join(cal_dir, short_name + "*"))
for file_name in files_to_remove:
logging.info("\tRemoving {}".format(file_name))
os.remove(file_name)
Expand Down

0 comments on commit 55b12f3

Please sign in to comment.