lint: fix linting with cleanup

Author: natthan-pigoux

cwltool/singularity.py

@@ -6,10 +6,9 @@
 import os.path
 import re
 import shutil
-import subprocess
 import sys
 from collections.abc import Callable, MutableMapping
-from subprocess import DEVNULL, check_call, check_output, run  # nosec
+from subprocess import check_call, check_output, run  # nosec
 from typing import cast
 
 from schema_salad.sourceline import SourceLine
@@ -146,6 +145,7 @@ def _normalize_sif_id(string: str) -> str:
         string += "_latest"
     return string.replace("/", "_") + ".sif"
 
+
 def _inspect_singularity_image(path: str) -> bool:
     """Inspect singularity image to be sure it is not an empty directory."""
     cmd = [
@@ -158,16 +158,17 @@ def _inspect_singularity_image(path: str) -> bool:
         result = run(cmd, capture_output=True, text=True)
     except Exception:
         return False
-    
+
     if result.returncode == 0:
         try:
             output = json.loads(result.stdout)
         except json.JSONDecodeError:
             return False
-        if output.get('data', {}).get('attributes', {}):
+        if output.get("data", {}).get("attributes", {}):
             return True
     return False
 
+
 class SingularityCommandLineJob(ContainerCommandLineJob):
     def __init__(
         self,
@@ -253,7 +254,9 @@ def get_image(
                 found = True
         elif "dockerImageId" not in dockerRequirement and "dockerPull" in dockerRequirement:
             # looking for local singularity sandbox image and handle it as a local image
-            if os.path.isdir(dockerRequirement["dockerPull"]) and _inspect_singularity_image(dockerRequirement["dockerPull"]):
+            if os.path.isdir(dockerRequirement["dockerPull"]) and _inspect_singularity_image(
+                dockerRequirement["dockerPull"]
+            ):
                 dockerRequirement["dockerImageId"] = dockerRequirement["dockerPull"]
                 _logger.info(
                     "Using local Singularity sandbox image found in %s",
@@ -280,7 +283,9 @@ def get_image(
                 if is_version_3_or_newer():
                     candidates.append(_normalize_sif_id(dockerRequirement["dockerImageId"]))
             # handling local singularity sandbox image
-            elif os.path.isdir(dockerRequirement["dockerImageId"]) and _inspect_singularity_image(dockerRequirement["dockerImageId"]):
+            elif os.path.isdir(dockerRequirement["dockerImageId"]) and _inspect_singularity_image(
+                dockerRequirement["dockerImageId"]
+            ):
                 _logger.info(
                     "Using local Singularity sandbox image found in %s",
                     dockerRequirement["dockerImageId"],

tests/test_singularity.py

@@ -160,9 +160,11 @@ def test_singularity3_docker_image_id_in_tool(tmp_path: Path) -> None:
         )
         assert result_code1 == 0
 
+
 @needs_singularity
 def test_singularity_local_sandbox_image(tmp_path: Path):
     import subprocess
+
     workdir = tmp_path / "working_dir"
     workdir.mkdir()
     with working_directory(workdir):
@@ -174,7 +176,7 @@ def test_singularity_local_sandbox_image(tmp_path: Path):
             "build",
             "--sandbox",
             container_path / "alpine",
-            "docker://alpine:latest"
+            "docker://alpine:latest",
         ]
         build = subprocess.run(cmd, capture_output=True, text=True)
         if build.returncode == 0: