Skip to content

Commit 743b688

Browse files
effigieseffigies
authored
Merge pull request #3673 from DimitriPapadopoulos/RUF
STY: Apply ruff rules (RUF)
2 parents f57986b + 39e7d3a commit 743b688

File tree

16 files changed

+24
-24
lines changed

16 files changed

+24
-24
lines changed

‎nipype/interfaces/ants/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
)
5151

5252
__all__ = [
53-
"AffineInitializer",
5453
"AI",
5554
"ANTS",
55+
"AffineInitializer",
5656
"AntsJointFusion",
5757
"ApplyTransforms",
5858
"ApplyTransformsToPoints",

‎nipype/interfaces/base/support.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
class RuntimeContext(AbstractContextManager):
2828
"""A context manager to run NiPype interfaces."""
2929

30-
__slots__ = ("_runtime", "_resmon", "_ignore_exc")
30+
__slots__ = ("_ignore_exc", "_resmon", "_runtime")
3131

3232
def __init__(self, resource_monitor=False, ignore_exception=False):
3333
"""Initialize the context manager object."""

‎nipype/interfaces/slicer/generate_classes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ def generate_class(
431431
output_spec = %module_name%OutputSpec
432432
_cmd = "%launcher% %name% "
433433
%output_filenames_code%\n"""
434-
template += f" _redirect_x = {str(redirect_x)}\n"
434+
template += f" _redirect_x = {redirect_x}\n"
435435

436436
main_class = (
437437
template.replace("%class_str%", class_string)

‎nipype/interfaces/spm/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ def _generate_job(self, prefix="", contents=None):
523523
if isinstance(contents, (str, bytes)):
524524
jobstring += f"{prefix} = '{contents}';\n"
525525
return jobstring
526-
jobstring += f"{prefix} = {str(contents)};\n"
526+
jobstring += f"{prefix} = {contents};\n"
527527
return jobstring
528528

529529
def _make_matlab_command(self, contents, postscript=None):

‎nipype/pipeline/plugins/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ def _local_hash_check(self, jobid, graph):
399399
if (
400400
cached
401401
and updated
402-
and (overwrite is False or overwrite is None and not always_run)
402+
and (overwrite is False or (overwrite is None and not always_run))
403403
):
404404
logger.debug(
405405
"Skipping cached node %s with ID %s.", self.procs[jobid], jobid
@@ -618,7 +618,7 @@ def _get_args(self, node, keywords):
618618
else:
619619
tmp_value = node.plugin_args[keyword]
620620

621-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
621+
if node.plugin_args.get("overwrite"):
622622
value = tmp_value
623623
else:
624624
value += tmp_value

‎nipype/pipeline/plugins/condor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, **kwargs):
3838
"""
3939
self._retry_timeout = 2
4040
self._max_tries = 2
41-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
41+
if kwargs.get("plugin_args"):
4242
if "retry_timeout" in kwargs["plugin_args"]:
4343
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
4444
if "max_tries" in kwargs["plugin_args"]:
@@ -71,7 +71,7 @@ def _submit_batchtask(self, scriptfile, node):
7171
if self._qsub_args:
7272
qsubargs = self._qsub_args
7373
if "qsub_args" in node.plugin_args:
74-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
74+
if node.plugin_args.get("overwrite"):
7575
qsubargs = node.plugin_args["qsub_args"]
7676
else:
7777
qsubargs += " " + node.plugin_args["qsub_args"]

‎nipype/pipeline/plugins/lsf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def __init__(self, **kwargs):
3131
self._retry_timeout = 2
3232
self._max_tries = 2
3333
self._bsub_args = ""
34-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
34+
if kwargs.get("plugin_args"):
3535
if "retry_timeout" in kwargs["plugin_args"]:
3636
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
3737
if "max_tries" in kwargs["plugin_args"]:
@@ -70,7 +70,7 @@ def _submit_batchtask(self, scriptfile, node):
7070
if self._bsub_args:
7171
bsubargs = self._bsub_args
7272
if "bsub_args" in node.plugin_args:
73-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
73+
if node.plugin_args.get("overwrite"):
7474
bsubargs = node.plugin_args["bsub_args"]
7575
else:
7676
bsubargs += " " + node.plugin_args["bsub_args"]

‎nipype/pipeline/plugins/oar.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, **kwargs):
3838
self._retry_timeout = 2
3939
self._max_tries = 2
4040
self._max_jobname_length = 15
41-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
41+
if kwargs.get("plugin_args"):
4242
if "oarsub_args" in kwargs["plugin_args"]:
4343
self._oarsub_args = kwargs["plugin_args"]["oarsub_args"]
4444
if "retry_timeout" in kwargs["plugin_args"]:
@@ -75,7 +75,7 @@ def _submit_batchtask(self, scriptfile, node):
7575
if self._oarsub_args:
7676
oarsubargs = self._oarsub_args
7777
if "oarsub_args" in node.plugin_args:
78-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
78+
if node.plugin_args.get("overwrite"):
7979
oarsubargs = node.plugin_args["oarsub_args"]
8080
else:
8181
oarsubargs += " " + node.plugin_args["oarsub_args"]

‎nipype/pipeline/plugins/pbs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def __init__(self, **kwargs):
3434
self._retry_timeout = 2
3535
self._max_tries = 2
3636
self._max_jobname_length = 15
37-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
37+
if kwargs.get("plugin_args"):
3838
if "retry_timeout" in kwargs["plugin_args"]:
3939
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
4040
if "max_tries" in kwargs["plugin_args"]:
@@ -73,7 +73,7 @@ def _submit_batchtask(self, scriptfile, node):
7373
if self._qsub_args:
7474
qsubargs = self._qsub_args
7575
if "qsub_args" in node.plugin_args:
76-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
76+
if node.plugin_args.get("overwrite"):
7777
qsubargs = node.plugin_args["qsub_args"]
7878
else:
7979
qsubargs += " " + node.plugin_args["qsub_args"]

‎nipype/pipeline/plugins/sge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ def __init__(self, **kwargs):
400400
instant_qstat = "qstat"
401401
cached_qstat = "qstat"
402402

403-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
403+
if kwargs.get("plugin_args"):
404404
if "retry_timeout" in kwargs["plugin_args"]:
405405
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
406406
if "max_tries" in kwargs["plugin_args"]:
@@ -428,7 +428,7 @@ def _submit_batchtask(self, scriptfile, node):
428428
if self._qsub_args:
429429
qsubargs = self._qsub_args
430430
if "qsub_args" in node.plugin_args:
431-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
431+
if node.plugin_args.get("overwrite"):
432432
qsubargs = node.plugin_args["qsub_args"]
433433
else:
434434
qsubargs += " " + node.plugin_args["qsub_args"]

‎nipype/pipeline/plugins/sgegraph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class SGEGraphPlugin(GraphPluginBase):
4747
def __init__(self, **kwargs):
4848
self._qsub_args = ""
4949
self._dont_resubmit_completed_jobs = False
50-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
50+
if kwargs.get("plugin_args"):
5151
plugin_args = kwargs["plugin_args"]
5252
if "template" in plugin_args:
5353
self._template = plugin_args["template"]

‎nipype/pipeline/plugins/slurm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def __init__(self, **kwargs):
4040
self._sbatch_args = None
4141
self._jobid_re = "Submitted batch job ([0-9]*)"
4242

43-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
43+
if kwargs.get("plugin_args"):
4444
if "retry_timeout" in kwargs["plugin_args"]:
4545
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
4646
if "max_tries" in kwargs["plugin_args"]:
@@ -100,7 +100,7 @@ def _submit_batchtask(self, scriptfile, node):
100100
if self._sbatch_args:
101101
sbatch_args = self._sbatch_args
102102
if "sbatch_args" in node.plugin_args:
103-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
103+
if node.plugin_args.get("overwrite"):
104104
sbatch_args = node.plugin_args["sbatch_args"]
105105
else:
106106
sbatch_args += " " + node.plugin_args["sbatch_args"]

‎nipype/pipeline/plugins/slurmgraph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class SLURMGraphPlugin(GraphPluginBase):
4242

4343
def __init__(self, **kwargs):
4444
self._sbatch_args = ""
45-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
45+
if kwargs.get("plugin_args"):
4646
if "retry_timeout" in kwargs["plugin_args"]:
4747
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
4848
if "max_tries" in kwargs["plugin_args"]:

‎nipype/pipeline/plugins/tools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def report_crash(node, traceback=None, hostname=None):
5555
login_name = getpass.getuser()
5656
except KeyError:
5757
login_name = f"UID{os.getuid():d}"
58-
crashfile = f"crash-{timeofcrash}-{login_name}-{name}-{str(uuid.uuid4())}"
58+
crashfile = f"crash-{timeofcrash}-{login_name}-{name}-{uuid.uuid4()}"
5959
crashdir = node.config["execution"].get("crashdump_dir", os.getcwd())
6060

6161
os.makedirs(crashdir, exist_ok=True)

‎nipype/utils/filemanip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,14 +716,14 @@ def write_rst_header(header, level=0):
716716
def write_rst_list(items, prefix=""):
717717
out = []
718718
for item in ensure_list(items):
719-
out.append(f"{prefix} {str(item)}")
719+
out.append(f"{prefix} {item}")
720720
return "\n".join(out) + "\n\n"
721721

722722

723723
def write_rst_dict(info, prefix=""):
724724
out = []
725725
for key, value in sorted(info.items()):
726-
out.append(f"{prefix}* {key} : {str(value)}")
726+
out.append(f"{prefix}* {key} : {value}")
727727
return "\n".join(out) + "\n\n"
728728

729729

‎nipype/utils/nipype_cmd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def run_instance(interface, options):
5252
try:
5353
setattr(interface.inputs, input_name, value)
5454
except ValueError as e:
55-
print(f"Error when setting the value of {input_name}: '{str(e)}'")
55+
print(f"Error when setting the value of {input_name}: '{e}'")
5656

5757
print(interface.inputs)
5858
res = interface.run()

0 commit comments

Comments
 (0)