From fe8e830fee26369d1d1b0e8b4d1d8499dc013287 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sun, 22 Sep 2024 09:58:10 +0200 Subject: [PATCH 1/5] STY: Apply ruff rule RUF010 RUF010 Use explicit conversion flag --- nipype/interfaces/slicer/generate_classes.py | 2 +- nipype/interfaces/spm/base.py | 2 +- nipype/pipeline/plugins/tools.py | 2 +- nipype/utils/filemanip.py | 4 ++-- nipype/utils/nipype_cmd.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nipype/interfaces/slicer/generate_classes.py b/nipype/interfaces/slicer/generate_classes.py index 7c0c53bac6..20ed8e9f21 100644 --- a/nipype/interfaces/slicer/generate_classes.py +++ b/nipype/interfaces/slicer/generate_classes.py @@ -431,7 +431,7 @@ def generate_class( output_spec = %module_name%OutputSpec _cmd = "%launcher% %name% " %output_filenames_code%\n""" - template += f" _redirect_x = {str(redirect_x)}\n" + template += f" _redirect_x = {redirect_x}\n" main_class = ( template.replace("%class_str%", class_string) diff --git a/nipype/interfaces/spm/base.py b/nipype/interfaces/spm/base.py index df6ca9fca6..9c653bb266 100644 --- a/nipype/interfaces/spm/base.py +++ b/nipype/interfaces/spm/base.py @@ -523,7 +523,7 @@ def _generate_job(self, prefix="", contents=None): if isinstance(contents, (str, bytes)): jobstring += f"{prefix} = '{contents}';\n" return jobstring - jobstring += f"{prefix} = {str(contents)};\n" + jobstring += f"{prefix} = {contents};\n" return jobstring def _make_matlab_command(self, contents, postscript=None): diff --git a/nipype/pipeline/plugins/tools.py b/nipype/pipeline/plugins/tools.py index 8c28f36246..8028535b01 100644 --- a/nipype/pipeline/plugins/tools.py +++ b/nipype/pipeline/plugins/tools.py @@ -55,7 +55,7 @@ def report_crash(node, traceback=None, hostname=None): login_name = getpass.getuser() except KeyError: login_name = f"UID{os.getuid():d}" - crashfile = f"crash-{timeofcrash}-{login_name}-{name}-{str(uuid.uuid4())}" + crashfile = f"crash-{timeofcrash}-{login_name}-{name}-{uuid.uuid4()}" crashdir = node.config["execution"].get("crashdump_dir", os.getcwd()) os.makedirs(crashdir, exist_ok=True) diff --git a/nipype/utils/filemanip.py b/nipype/utils/filemanip.py index ef52d00cc6..b388c9122a 100644 --- a/nipype/utils/filemanip.py +++ b/nipype/utils/filemanip.py @@ -716,14 +716,14 @@ def write_rst_header(header, level=0): def write_rst_list(items, prefix=""): out = [] for item in ensure_list(items): - out.append(f"{prefix} {str(item)}") + out.append(f"{prefix} {item}") return "\n".join(out) + "\n\n" def write_rst_dict(info, prefix=""): out = [] for key, value in sorted(info.items()): - out.append(f"{prefix}* {key} : {str(value)}") + out.append(f"{prefix}* {key} : {value}") return "\n".join(out) + "\n\n" diff --git a/nipype/utils/nipype_cmd.py b/nipype/utils/nipype_cmd.py index 2adbd179de..38ae1a101b 100644 --- a/nipype/utils/nipype_cmd.py +++ b/nipype/utils/nipype_cmd.py @@ -52,7 +52,7 @@ def run_instance(interface, options): try: setattr(interface.inputs, input_name, value) except ValueError as e: - print(f"Error when setting the value of {input_name}: '{str(e)}'") + print(f"Error when setting the value of {input_name}: '{e}'") print(interface.inputs) res = interface.run() From 41859cb06a51176ce314fb7ed75ab1fef2e6db87 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sun, 22 Sep 2024 10:01:58 +0200 Subject: [PATCH 2/5] STY: Apply ruff rule RUF019 RUF019 Unnecessary key check before dictionary access --- nipype/pipeline/plugins/base.py | 2 +- nipype/pipeline/plugins/condor.py | 4 ++-- nipype/pipeline/plugins/lsf.py | 4 ++-- nipype/pipeline/plugins/oar.py | 4 ++-- nipype/pipeline/plugins/pbs.py | 4 ++-- nipype/pipeline/plugins/sge.py | 4 ++-- nipype/pipeline/plugins/sgegraph.py | 2 +- nipype/pipeline/plugins/slurm.py | 4 ++-- nipype/pipeline/plugins/slurmgraph.py | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/nipype/pipeline/plugins/base.py b/nipype/pipeline/plugins/base.py index fe632f8c59..d393022780 100644 --- a/nipype/pipeline/plugins/base.py +++ b/nipype/pipeline/plugins/base.py @@ -618,7 +618,7 @@ def _get_args(self, node, keywords): else: tmp_value = node.plugin_args[keyword] - if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]: + if node.plugin_args.get("overwrite"): value = tmp_value else: value += tmp_value diff --git a/nipype/pipeline/plugins/condor.py b/nipype/pipeline/plugins/condor.py index 2d34797523..6ebd080e61 100644 --- a/nipype/pipeline/plugins/condor.py +++ b/nipype/pipeline/plugins/condor.py @@ -38,7 +38,7 @@ def __init__(self, **kwargs): """ self._retry_timeout = 2 self._max_tries = 2 - if "plugin_args" in kwargs and kwargs["plugin_args"]: + if kwargs.get("plugin_args"): if "retry_timeout" in kwargs["plugin_args"]: self._retry_timeout = kwargs["plugin_args"]["retry_timeout"] if "max_tries" in kwargs["plugin_args"]: @@ -71,7 +71,7 @@ def _submit_batchtask(self, scriptfile, node): if self._qsub_args: qsubargs = self._qsub_args if "qsub_args" in node.plugin_args: - if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]: + if node.plugin_args.get("overwrite"): qsubargs = node.plugin_args["qsub_args"] else: qsubargs += " " + node.plugin_args["qsub_args"] diff --git a/nipype/pipeline/plugins/lsf.py b/nipype/pipeline/plugins/lsf.py index dbd7f7d810..d2753a264c 100644 --- a/nipype/pipeline/plugins/lsf.py +++ b/nipype/pipeline/plugins/lsf.py @@ -31,7 +31,7 @@ def __init__(self, **kwargs): self._retry_timeout = 2 self._max_tries = 2 self._bsub_args = "" - if "plugin_args" in kwargs and kwargs["plugin_args"]: + if kwargs.get("plugin_args"): if "retry_timeout" in kwargs["plugin_args"]: self._retry_timeout = kwargs["plugin_args"]["retry_timeout"] if "max_tries" in kwargs["plugin_args"]: @@ -70,7 +70,7 @@ def _submit_batchtask(self, scriptfile, node): if self._bsub_args: bsubargs = self._bsub_args if "bsub_args" in node.plugin_args: - if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]: + if node.plugin_args.get("overwrite"): bsubargs = node.plugin_args["bsub_args"] else: bsubargs += " " + node.plugin_args["bsub_args"] diff --git a/nipype/pipeline/plugins/oar.py b/nipype/pipeline/plugins/oar.py index 409d1746a5..df56391bae 100644 --- a/nipype/pipeline/plugins/oar.py +++ b/nipype/pipeline/plugins/oar.py @@ -38,7 +38,7 @@ def __init__(self, **kwargs): self._retry_timeout = 2 self._max_tries = 2 self._max_jobname_length = 15 - if "plugin_args" in kwargs and kwargs["plugin_args"]: + if kwargs.get("plugin_args"): if "oarsub_args" in kwargs["plugin_args"]: self._oarsub_args = kwargs["plugin_args"]["oarsub_args"] if "retry_timeout" in kwargs["plugin_args"]: @@ -75,7 +75,7 @@ def _submit_batchtask(self, scriptfile, node): if self._oarsub_args: oarsubargs = self._oarsub_args if "oarsub_args" in node.plugin_args: - if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]: + if node.plugin_args.get("overwrite"): oarsubargs = node.plugin_args["oarsub_args"] else: oarsubargs += " " + node.plugin_args["oarsub_args"] diff --git a/nipype/pipeline/plugins/pbs.py b/nipype/pipeline/plugins/pbs.py index e6e699efd0..d967af0bed 100644 --- a/nipype/pipeline/plugins/pbs.py +++ b/nipype/pipeline/plugins/pbs.py @@ -34,7 +34,7 @@ def __init__(self, **kwargs): self._retry_timeout = 2 self._max_tries = 2 self._max_jobname_length = 15 - if "plugin_args" in kwargs and kwargs["plugin_args"]: + if kwargs.get("plugin_args"): if "retry_timeout" in kwargs["plugin_args"]: self._retry_timeout = kwargs["plugin_args"]["retry_timeout"] if "max_tries" in kwargs["plugin_args"]: @@ -73,7 +73,7 @@ def _submit_batchtask(self, scriptfile, node): if self._qsub_args: qsubargs = self._qsub_args if "qsub_args" in node.plugin_args: - if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]: + if node.plugin_args.get("overwrite"): qsubargs = node.plugin_args["qsub_args"] else: qsubargs += " " + node.plugin_args["qsub_args"] diff --git a/nipype/pipeline/plugins/sge.py b/nipype/pipeline/plugins/sge.py index c588c0478a..b9ebd1528a 100644 --- a/nipype/pipeline/plugins/sge.py +++ b/nipype/pipeline/plugins/sge.py @@ -400,7 +400,7 @@ def __init__(self, **kwargs): instant_qstat = "qstat" cached_qstat = "qstat" - if "plugin_args" in kwargs and kwargs["plugin_args"]: + if kwargs.get("plugin_args"): if "retry_timeout" in kwargs["plugin_args"]: self._retry_timeout = kwargs["plugin_args"]["retry_timeout"] if "max_tries" in kwargs["plugin_args"]: @@ -428,7 +428,7 @@ def _submit_batchtask(self, scriptfile, node): if self._qsub_args: qsubargs = self._qsub_args if "qsub_args" in node.plugin_args: - if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]: + if node.plugin_args.get("overwrite"): qsubargs = node.plugin_args["qsub_args"] else: qsubargs += " " + node.plugin_args["qsub_args"] diff --git a/nipype/pipeline/plugins/sgegraph.py b/nipype/pipeline/plugins/sgegraph.py index c116a1848c..5cd1c7bfb7 100644 --- a/nipype/pipeline/plugins/sgegraph.py +++ b/nipype/pipeline/plugins/sgegraph.py @@ -47,7 +47,7 @@ class SGEGraphPlugin(GraphPluginBase): def __init__(self, **kwargs): self._qsub_args = "" self._dont_resubmit_completed_jobs = False - if "plugin_args" in kwargs and kwargs["plugin_args"]: + if kwargs.get("plugin_args"): plugin_args = kwargs["plugin_args"] if "template" in plugin_args: self._template = plugin_args["template"] diff --git a/nipype/pipeline/plugins/slurm.py b/nipype/pipeline/plugins/slurm.py index cd37339695..bdc142059f 100644 --- a/nipype/pipeline/plugins/slurm.py +++ b/nipype/pipeline/plugins/slurm.py @@ -40,7 +40,7 @@ def __init__(self, **kwargs): self._sbatch_args = None self._jobid_re = "Submitted batch job ([0-9]*)" - if "plugin_args" in kwargs and kwargs["plugin_args"]: + if kwargs.get("plugin_args"): if "retry_timeout" in kwargs["plugin_args"]: self._retry_timeout = kwargs["plugin_args"]["retry_timeout"] if "max_tries" in kwargs["plugin_args"]: @@ -100,7 +100,7 @@ def _submit_batchtask(self, scriptfile, node): if self._sbatch_args: sbatch_args = self._sbatch_args if "sbatch_args" in node.plugin_args: - if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]: + if node.plugin_args.get("overwrite"): sbatch_args = node.plugin_args["sbatch_args"] else: sbatch_args += " " + node.plugin_args["sbatch_args"] diff --git a/nipype/pipeline/plugins/slurmgraph.py b/nipype/pipeline/plugins/slurmgraph.py index 6033e5316a..c74ab05a87 100644 --- a/nipype/pipeline/plugins/slurmgraph.py +++ b/nipype/pipeline/plugins/slurmgraph.py @@ -42,7 +42,7 @@ class SLURMGraphPlugin(GraphPluginBase): def __init__(self, **kwargs): self._sbatch_args = "" - if "plugin_args" in kwargs and kwargs["plugin_args"]: + if kwargs.get("plugin_args"): if "retry_timeout" in kwargs["plugin_args"]: self._retry_timeout = kwargs["plugin_args"]["retry_timeout"] if "max_tries" in kwargs["plugin_args"]: From 31c98250ae00fc0346c5060795d38561e7883ab7 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 5 Oct 2024 17:45:27 +0200 Subject: [PATCH 3/5] STY: Apply ruff rule RUF021 RUF021 Parenthesize `a and b` expressions when chaining `and` and `or` together, to make the precedence clear --- nipype/pipeline/plugins/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/pipeline/plugins/base.py b/nipype/pipeline/plugins/base.py index d393022780..1e2106304d 100644 --- a/nipype/pipeline/plugins/base.py +++ b/nipype/pipeline/plugins/base.py @@ -399,7 +399,7 @@ def _local_hash_check(self, jobid, graph): if ( cached and updated - and (overwrite is False or overwrite is None and not always_run) + and (overwrite is False or (overwrite is None and not always_run)) ): logger.debug( "Skipping cached node %s with ID %s.", self.procs[jobid], jobid From 05039f16605747db66128cb37b4f296760391892 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 5 Oct 2024 17:46:31 +0200 Subject: [PATCH 4/5] STY: Apply ruff rule RUF022 RUF022 `__all__` is not sorted --- nipype/interfaces/ants/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/interfaces/ants/__init__.py b/nipype/interfaces/ants/__init__.py index 9671f1b31d..e8157a0312 100644 --- a/nipype/interfaces/ants/__init__.py +++ b/nipype/interfaces/ants/__init__.py @@ -50,9 +50,9 @@ ) __all__ = [ - "AffineInitializer", "AI", "ANTS", + "AffineInitializer", "AntsJointFusion", "ApplyTransforms", "ApplyTransformsToPoints", From 39e7d3ab849a6547cad9bbbc0a8d1277ae5a92cb Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos <3234522+DimitriPapadopoulos@users.noreply.github.com> Date: Sat, 5 Oct 2024 17:47:17 +0200 Subject: [PATCH 5/5] STY: Apply ruff rule UF023 UF023 `__slots__` is not sorted --- nipype/interfaces/base/support.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipype/interfaces/base/support.py b/nipype/interfaces/base/support.py index c6c223b668..06f7df906a 100644 --- a/nipype/interfaces/base/support.py +++ b/nipype/interfaces/base/support.py @@ -27,7 +27,7 @@ class RuntimeContext(AbstractContextManager): """A context manager to run NiPype interfaces.""" - __slots__ = ("_runtime", "_resmon", "_ignore_exc") + __slots__ = ("_ignore_exc", "_resmon", "_runtime") def __init__(self, resource_monitor=False, ignore_exception=False): """Initialize the context manager object."""