From 327028aed6205806709ce24387acb3f2dafddcab Mon Sep 17 00:00:00 2001 From: Matthias Bernt Date: Thu, 16 Nov 2023 17:47:17 +0100 Subject: [PATCH] linter fixes --- lib/galaxy/metadata/set_metadata.py | 6 +++--- lib/galaxy/tool_util/output_checker.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/metadata/set_metadata.py b/lib/galaxy/metadata/set_metadata.py index 3723e5299a8d..ec728369ea5d 100644 --- a/lib/galaxy/metadata/set_metadata.py +++ b/lib/galaxy/metadata/set_metadata.py @@ -259,11 +259,11 @@ def set_meta(new_dataset_instance, file_dict): with open(path / "outputs" / "tool_stdout", "rb") as f: task_stdout = unicodify(f.read(MAX_STDIO_READ_BYTES), strip_null=True) if task_stdout: - tool_stdout = "%s[%s stdout]\n%s\n" % (tool_stdout, path.name, task_stdout) + tool_stdout = "{}[{} stdout]\n{}\n".format(tool_stdout, path.name, task_stdout) with open(path / "outputs" / "tool_stderr", "rb") as f: task_stderr = unicodify(f.read(MAX_STDIO_READ_BYTES), strip_null=True) if task_stderr: - tool_stderr = "%s[%s stderr]\n%s\n" % (tool_stderr, path.name, task_stderr) + tool_stderr = "{}[{} stderr]\n{}\n".format(tool_stderr, path.name, task_stderr) else: wdc = os.listdir(tool_job_working_directory) odc = os.listdir(outputs_directory) @@ -346,7 +346,7 @@ def set_meta(new_dataset_instance, file_dict): input_ext=input_ext, ) collect_dynamic_outputs(job_context, output_collections) - except MaxDiscoveredFilesExceededError as e: + except MaxDiscoveredFilesExceededError: final_job_state = Job.states.ERROR job_messages.append( { diff --git a/lib/galaxy/tool_util/output_checker.py b/lib/galaxy/tool_util/output_checker.py index f93b1011981a..ab9a3c6f4ba6 100644 --- a/lib/galaxy/tool_util/output_checker.py +++ b/lib/galaxy/tool_util/output_checker.py @@ -7,7 +7,6 @@ List, Tuple, TYPE_CHECKING, - Union ) from galaxy.tool_util.parser.stdio import StdioErrorLevel