Skip to content

Commit da983a0

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 8c9fd52 commit da983a0

File tree

10 files changed

+12
-14
lines changed

10 files changed

+12
-14
lines changed

dvc/__pyinstaller/hook-celery.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
_EXCLUDES = ("celery.bin", "celery.contrib")
99
hiddenimports = collect_submodules(
1010
"celery",
11-
filter=lambda name: not any(
12-
is_module_or_submodule(name, module) for module in _EXCLUDES
11+
filter=lambda name: (
12+
not any(is_module_or_submodule(name, module) for module in _EXCLUDES)
1313
),
1414
)

dvc/repo/experiments/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def _log_reproduced(self, revs: Iterable[str], tmp_dir: bool = False):
188188
rev_names = self.get_exact_name(revs)
189189
for rev in revs:
190190
name = rev_names[rev]
191-
names.append(name if name else rev[:7])
191+
names.append(name or rev[:7])
192192
ui.write("\nRan experiment(s): {}".format(", ".join(names)))
193193
if tmp_dir:
194194
ui.write(

dvc/repo/experiments/collect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ def collect(
328328
name=baseline_names.get(baseline_rev),
329329
data=baseline_data.data,
330330
error=baseline_data.error,
331-
experiments=experiments if experiments else None,
331+
experiments=experiments or None,
332332
)
333333
)
334334
return result

dvc/repo/experiments/executor/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ def commit(
757757
logger.debug("Commit to current experiment branch '%s'", branch)
758758
else:
759759
baseline_rev = scm.get_ref(EXEC_BASELINE)
760-
name = exp_name if exp_name else f"exp-{exp_hash[:5]}"
760+
name = exp_name or f"exp-{exp_hash[:5]}"
761761
ref_info = ExpRefInfo(baseline_rev, name)
762762
branch = str(ref_info)
763763
old_ref = None

dvc/repo/experiments/refs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ExpRefInfo:
3434

3535
def __init__(self, baseline_sha: str, name: Optional[str] = None):
3636
self.baseline_sha = baseline_sha
37-
self.name: str = name if name else ""
37+
self.name: str = name or ""
3838

3939
def __str__(self):
4040
return "/".join(self.parts)

dvc/repo/experiments/stash.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def format_message(
6767
branch: Optional[str] = None,
6868
) -> str:
6969
msg = cls.MESSAGE_FORMAT.format(
70-
rev=rev, baseline_rev=baseline_rev, name=name if name else ""
70+
rev=rev, baseline_rev=baseline_rev, name=name or ""
7171
)
7272
branch_msg = f":{branch}" if branch else ""
7373
return f"{msg}{branch_msg}"
@@ -124,9 +124,7 @@ def stash_revs(self) -> dict[str, ApplyStashEntry]:
124124

125125
@classmethod
126126
def format_message(cls, head_rev: str, rev: str, name: Optional[str] = None) -> str:
127-
return cls.MESSAGE_FORMAT.format(
128-
head_rev=head_rev, rev=rev, name=name if name else ""
129-
)
127+
return cls.MESSAGE_FORMAT.format(head_rev=head_rev, rev=rev, name=name or "")
130128

131129
@contextmanager
132130
def preserve_workspace(

dvc/repo/experiments/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ def exp_commits(
200200
) -> Iterable[str]:
201201
"""Iterate over all experiment commits."""
202202
shas: set[str] = set()
203-
refs = ref_infos if ref_infos else exp_refs(scm)
203+
refs = ref_infos or exp_refs(scm)
204204
for ref_info in refs:
205205
shas.update(scm.branch_revs(str(ref_info), ref_info.baseline_sha))
206206
yield from shas

tests/func/experiments/test_experiments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def test_new_simple(tmp_dir, scm, dvc, exp_stage, mocker, name, workspace):
5353
if workspace:
5454
assert (tmp_dir / "metrics.yaml").read_text().strip() == "foo: 2"
5555

56-
exp_name = name if name else ref_info.name
56+
exp_name = name or ref_info.name
5757
assert dvc.experiments.get_exact_name([exp])[exp] == exp_name
5858
assert resolve_rev(scm, exp_name) == exp
5959

tests/func/experiments/test_save.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_exp_save(tmp_dir, dvc, scm, name):
2828
assert ref_info
2929
assert ref_info.baseline_sha == baseline
3030

31-
exp_name = name if name else ref_info.name
31+
exp_name = name or ref_info.name
3232
assert dvc.experiments.get_exact_name([exp])[exp] == exp_name
3333
assert resolve_rev(scm, exp_name) == exp
3434

tests/unit/command/test_diff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ def test_diff_show_markdown_and_hash(mocker, show_hash, dvc):
196196
cmd = args.func(args)
197197

198198
diff = {}
199-
show_hash = show_hash if show_hash else False
199+
show_hash = show_hash or False
200200
mock_show_markdown = mocker.patch("dvc.commands.diff._show_markdown")
201201
mocker.patch("dvc.repo.Repo.diff", return_value=diff.copy())
202202

0 commit comments

Comments
 (0)