STY: Auto-ruff fixes (+black)

Author: effigies

pydra/engine/core.py

@@ -491,7 +491,7 @@ def _run(self, rerun=False, **kwargs):
         lockfile = self.cache_dir / (checksum + ".lock")
         # Eagerly retrieve cached - see scenarios in __init__()
         self.hooks.pre_run(self)
-        logger.debug(f"'%s' is attempting to acquire lock on %s", self.name, lockfile)
+        logger.debug("'%s' is attempting to acquire lock on %s", self.name, lockfile)
         with SoftFileLock(lockfile):
             if not (rerun or self.task_rerun):
                 result = self.result()
@@ -1105,7 +1105,7 @@ async def _run(self, submitter=None, rerun=False, **kwargs):
         lockfile = self.cache_dir / (checksum + ".lock")
         self.hooks.pre_run(self)
         logger.debug(
-            f"'%s' is attempting to acquire lock on %s with Pydra lock",
+            "'%s' is attempting to acquire lock on %s with Pydra lock",
             self.name,
             lockfile,
         )

pydra/engine/helpers_file.py

@@ -606,7 +606,7 @@ def template_update(inputs, output_dir, state_ind=None, map_copyfiles=None):
     for fld in fields_templ:
         if fld.type not in [str, ty.Union[str, bool]]:
             raise Exception(
-                f"fields with output_file_template"
+                "fields with output_file_template"
                 " has to be a string or Union[str, bool]"
             )
         dict_mod[fld.name] = template_update_single(
@@ -638,7 +638,7 @@ def template_update_single(
     if spec_type == "input":
         if field.type not in [str, ty.Union[str, bool]]:
             raise Exception(
-                f"fields with output_file_template"
+                "fields with output_file_template"
                 "has to be a string or Union[str, bool]"
             )
         inp_val_set = inputs_dict_st[field.name]

pydra/engine/tests/data_tests/loading.py

@@ -1,6 +1,3 @@
-import os
-
-
 def loading(filename):
     with open(filename) as f:
         txt = f.read()

pydra/engine/tests/data_tests/saving.py

@@ -1,6 +1,3 @@
-import os
-
-
 def saving(filename):
     with open(filename, "w") as f:
         f.write("Hello!")

pydra/engine/tests/test_boutiques.py

@@ -1,6 +1,5 @@
-import os, shutil
+import shutil
 import subprocess as sp
-from pathlib import Path
 import attr
 import pytest
 
@@ -9,7 +8,6 @@
 from ..submitter import Submitter
 from ..boutiques import BoshTask
 from .utils import result_no_submitter, result_submitter, no_win
-from ...engine.specs import File
 
 need_bosh_docker = pytest.mark.skipif(
     shutil.which("docker") is None

pydra/engine/tests/test_dockertask.py

@@ -1,4 +1,3 @@
-import os
 import pytest
 import attr
 
@@ -71,9 +70,7 @@ def test_docker_1_dockerflag_exception(plugin):
     """using ShellComandTask with container_info=("docker"), no image provided"""
     cmd = "whoami"
     with pytest.raises(Exception) as excinfo:
-        shocky = ShellCommandTask(
-            name="shocky", executable=cmd, container_info=("docker")
-        )
+        ShellCommandTask(name="shocky", executable=cmd, container_info=("docker"))
     assert "container_info has to have 2 elements" in str(excinfo.value)
 
 
@@ -1080,7 +1077,7 @@ def test_docker_inputspec_3a(plugin, tmpdir):
     )
 
     with pytest.raises(Exception) as excinfo:
-        res = docky()
+        docky()
     assert "use field.metadata['container_path']=True" in str(excinfo.value)
 
 

pydra/engine/tests/test_graph.py

@@ -65,13 +65,13 @@ def test_edges_3():
 
 def test_edges_ecxeption_1():
     with pytest.raises(Exception) as excinfo:
-        graph = DiGraph(nodes=[A, B, A], edges=[(A, B)])
+        DiGraph(nodes=[A, B, A], edges=[(A, B)])
     assert "repeated elements" in str(excinfo.value)
 
 
 def test_edges_ecxeption_2():
     with pytest.raises(Exception) as excinfo:
-        graph = DiGraph(nodes=[A, B], edges=[(A, C)])
+        DiGraph(nodes=[A, B], edges=[(A, C)])
     assert "can't be added" in str(excinfo.value)
 
 

pydra/engine/tests/test_helpers.py

@@ -228,9 +228,9 @@ def test_load_and_run(tmpdir):
 def test_load_and_run_exception_load(tmpdir):
     """testing raising exception and saving info in crashfile when when load_and_run"""
     task_pkl = Path(tmpdir.join("task_main.pkl"))
-    task = raise_xeq1(name="raise", x=[1, 2]).split("x")
-    with pytest.raises(FileNotFoundError) as excinfo:
-        task_0 = load_and_run(task_pkl=task_pkl, ind=0)
+    raise_xeq1(name="raise", x=[1, 2]).split("x")
+    with pytest.raises(FileNotFoundError):
+        load_and_run(task_pkl=task_pkl, ind=0)
 
 
 def test_load_and_run_exception_run(tmpdir):
@@ -245,7 +245,7 @@ def test_load_and_run_exception_run(tmpdir):
         cp.dump(task, fp)
 
     with pytest.raises(Exception) as excinfo:
-        task_0 = load_and_run(task_pkl=task_pkl, ind=0)
+        load_and_run(task_pkl=task_pkl, ind=0)
     assert "i'm raising an exception!" in str(excinfo.value)
     # checking if the crashfile has been created
     assert "crash" in str(excinfo.value)

pydra/engine/tests/test_nipype1_convert.py

@@ -1,15 +1,9 @@
-import attr
 import typing as ty
-import os, sys
 import pytest
-from pathlib import Path
 
 
 from ..task import ShellCommandTask
-from ..submitter import Submitter
-from ..core import Workflow
 from ..specs import ShellOutSpec, ShellSpec, SpecInfo, File
-from .utils import result_no_submitter, result_submitter, use_validator
 
 interf_input_spec = SpecInfo(
     name="Input", fields=[("test", ty.Any, {"help_string": "test"})], bases=(ShellSpec,)

pydra/engine/tests/test_node_task.py

@@ -575,7 +575,7 @@ def test_task_nostate_cachedir(plugin_dask_opt, tmpdir):
 @pytest.mark.flaky(reruns=2)  # when dask
 def test_task_nostate_cachedir_relativepath(tmpdir, plugin_dask_opt):
     """task with provided cache_dir as relative path"""
-    cwd = tmpdir.chdir()
+    tmpdir.chdir()
     cache_dir = "test_task_nostate"
     tmpdir.mkdir(cache_dir)
 
@@ -1266,7 +1266,7 @@ def test_task_state_comb_singl_1(plugin, tmpdir):
     assert nn.state.splitter == "NA.a"
     assert nn.state.splitter_rpn == ["NA.a"]
     assert nn.state.combiner == ["NA.a"]
-    assert nn.state.splitter_final == None
+    assert nn.state.splitter_final is None
     assert nn.state.splitter_rpn_final == []
 
     with Submitter(plugin=plugin) as sub: