10000 STY: Apply ruff rules (RUF) by DimitriPapadopoulos · Pull Request #3673 · nipy/nipype · GitHub
[go: up one dir, main page]
Skip to content

STY: Apply ruff rules (RUF) #3673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 5, 2024
Merged

STY: Apply ruff rules (RUF) #3673

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe8e830
STY: Apply ruff rule RUF010
DimitriPapadopoulos Sep 22, 2024
41859cb
STY: Apply ruff rule RUF019
DimitriPapadopoulos Sep 22, 2024
31c9825
STY: Apply ruff rule RUF021
DimitriPapadopoulos Oct 5, 2024
05039f1
STY: Apply ruff rule RUF022
DimitriPapadopoulos Oct 5, 2024
39e7d3a
STY: Apply ruff rule UF023
DimitriPapadopoulos Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
STY: Apply ruff rule RUF019 
RUF019 Unnecessary key check before dictionary access
  • Loading branch information
@DimitriPapadopoulos
DimitriPapadopoulos committed Oct 5, 2024
commit 41859cb06a51176ce314fb7ed75ab1fef2e6db87
2 changes: 1 addition & 1 deletion nipype/pipeline/plugins/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions nipype/pipeline/plugins/condor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down Expand Up @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions nipype/pipeline/plugins/lsf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down Expand Up @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions nipype/pipeline/plugins/oar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down Expand Up @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions nipype/pipeline/plugins/pbs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down Expand Up @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions nipype/pipeline/plugins/sge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion nipype/pipeline/plugins/sgegraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
4 changes: 2 additions & 2 deletions nipype/pipeline/plugins/slurm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion nipype/pipeline/plugins/slurmgraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]:
Expand Down
0