feat: format

Author: kannon92

cwltool/job.py

@@ -314,7 +314,10 @@ def _execute(
                     raise WorkflowException(f"{self.stdin} missing from pathmapper")
                 else:
                     stdin_path = rmap[1]
-            def stderr_stdout_log_path(base_path_logs, stderr_or_stdout) -> Optional[str]:
+
+            def stderr_stdout_log_path(
+                base_path_logs, stderr_or_stdout
+            ) -> Optional[str]:
                 if stderr_or_stdout is not None:
                     abserr = os.path.join(base_path_logs, stderr_or_stdout)
                     dnerr = os.path.dirname(abserr)
@@ -393,13 +396,16 @@ def stderr_stdout_log_path(base_path_logs, stderr_or_stdout) -> Optional[str]:
             # Move logs from log location to final output
             if self.outdir != self.base_path_logs:
                 if stdout_path:
-                    new_stdout_path = stdout_path.replace(self.base_path_logs, self.outdir)
+                    new_stdout_path = stdout_path.replace(
+                        self.base_path_logs, self.outdir
+                    )
                     shutil.copy2(stdout_path, new_stdout_path)
                 if stderr_path:
-                    new_stderr_path = stderr_path.replace(self.base_path_logs, self.outdir)
+                    new_stderr_path = stderr_path.replace(
+                        self.base_path_logs, self.outdir
+                    )
                     shutil.copy2(stderr_path, new_stderr_path)
 
-
             outputs = self.collect_outputs(self.outdir, rcode)
             outputs = bytes2str_in_dicts(outputs)  # type: ignore
         except OSError as e:

tests/test_stdout_stderr_log_dir.py

@@ -6,28 +6,19 @@
 
 from .util import get_main_output, needs_docker
 
+
 def test_log_dir_echo_output() -> None:
     _, stdout, stderr = get_main_output(
-        [
-            "--log-dir",
-            "logs",
-            "tests/echo.cwl",
-            "--inp", "hello"
-        ]
+        ["--log-dir", "logs", "tests/echo.cwl", "--inp", "hello"]
     )
     assert "completed success" in stderr, stderr
-    assert json.loads(stdout)['out'].strip('\n') == 'hello'
+    assert json.loads(stdout)["out"].strip("\n") == "hello"
+
 
 def test_log_dir_echo_no_output() -> None:
     _, stdout, stderr = get_main_output(
-        [
-            "--log-dir",
-            "logs",
-            "tests/echo-stdout-log-dir.cwl",
-            "--inp", "hello"
-        ]
+        ["--log-dir", "logs", "tests/echo-stdout-log-dir.cwl", "--inp", "hello"]
     )
-    for dir in os.listdir('logs'):
-        for file in os.listdir(f'logs/{dir}'):
-            assert file == 'out.txt'
-
+    for dir in os.listdir("logs"):
+        for file in os.listdir(f"logs/{dir}"):
+            assert file == "out.txt"