From fefa62f2d6ab8b96b7dd03cb6cd30c9a7ac6f3a0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 23 Feb 2026 18:41:54 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.14.13 → v0.15.2](https://github.com/astral-sh/ruff-pre-commit/compare/v0.14.13...v0.15.2) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bc15dd696f..5064e077f8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -22,7 +22,7 @@ repos: - id: sort-simple-yaml - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: 'v0.14.13' + rev: 'v0.15.2' hooks: - id: ruff-check args: [--fix, --exit-non-zero-on-fix] From 086849afa1b25f2bd7ace4b2bee52e3253eb65d1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 23 Feb 2026 18:42:06 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- dvc/__pyinstaller/hook-celery.py | 4 ++-- dvc/repo/experiments/__init__.py | 2 +- dvc/repo/experiments/collect.py | 2 +- dvc/repo/experiments/executor/base.py | 2 +- dvc/repo/experiments/refs.py | 2 +- dvc/repo/experiments/stash.py | 6 ++---- dvc/repo/experiments/utils.py | 2 +- tests/func/experiments/test_experiments.py | 2 +- tests/func/experiments/test_save.py | 2 +- tests/unit/command/test_diff.py | 2 +- 10 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dvc/__pyinstaller/hook-celery.py b/dvc/__pyinstaller/hook-celery.py index 4b33db3fb1..78918847d0 100644 --- a/dvc/__pyinstaller/hook-celery.py +++ b/dvc/__pyinstaller/hook-celery.py @@ -8,7 +8,7 @@ _EXCLUDES = ("celery.bin", "celery.contrib") hiddenimports = collect_submodules( "celery", - filter=lambda name: not any( - is_module_or_submodule(name, module) for module in _EXCLUDES + filter=lambda name: ( + not any(is_module_or_submodule(name, module) for module in _EXCLUDES) ), ) diff --git a/dvc/repo/experiments/__init__.py b/dvc/repo/experiments/__init__.py index e03c2d3821..9f7e677354 100644 --- a/dvc/repo/experiments/__init__.py +++ b/dvc/repo/experiments/__init__.py @@ -188,7 +188,7 @@ def _log_reproduced(self, revs: Iterable[str], tmp_dir: bool = False): rev_names = self.get_exact_name(revs) for rev in revs: name = rev_names[rev] - names.append(name if name else rev[:7]) + names.append(name or rev[:7]) ui.write("\nRan experiment(s): {}".format(", ".join(names))) if tmp_dir: ui.write( diff --git a/dvc/repo/experiments/collect.py b/dvc/repo/experiments/collect.py index 337827d5fe..36c8e9fde0 100644 --- a/dvc/repo/experiments/collect.py +++ b/dvc/repo/experiments/collect.py @@ -328,7 +328,7 @@ def collect( name=baseline_names.get(baseline_rev), data=baseline_data.data, error=baseline_data.error, - experiments=experiments if experiments else None, + experiments=experiments or None, ) ) return result diff --git a/dvc/repo/experiments/executor/base.py b/dvc/repo/experiments/executor/base.py index 31ddcbac11..bccb8892ee 100644 --- a/dvc/repo/experiments/executor/base.py +++ b/dvc/repo/experiments/executor/base.py @@ -757,7 +757,7 @@ def commit( logger.debug("Commit to current experiment branch '%s'", branch) else: baseline_rev = scm.get_ref(EXEC_BASELINE) - name = exp_name if exp_name else f"exp-{exp_hash[:5]}" + name = exp_name or f"exp-{exp_hash[:5]}" ref_info = ExpRefInfo(baseline_rev, name) branch = str(ref_info) old_ref = None diff --git a/dvc/repo/experiments/refs.py b/dvc/repo/experiments/refs.py index 3a34ff35a0..b04c822621 100644 --- a/dvc/repo/experiments/refs.py +++ b/dvc/repo/experiments/refs.py @@ -34,7 +34,7 @@ class ExpRefInfo: def __init__(self, baseline_sha: str, name: Optional[str] = None): self.baseline_sha = baseline_sha - self.name: str = name if name else "" + self.name: str = name or "" def __str__(self): return "/".join(self.parts) diff --git a/dvc/repo/experiments/stash.py b/dvc/repo/experiments/stash.py index c2904c160b..54504cd5a4 100644 --- a/dvc/repo/experiments/stash.py +++ b/dvc/repo/experiments/stash.py @@ -67,7 +67,7 @@ def format_message( branch: Optional[str] = None, ) -> str: msg = cls.MESSAGE_FORMAT.format( - rev=rev, baseline_rev=baseline_rev, name=name if name else "" + rev=rev, baseline_rev=baseline_rev, name=name or "" ) branch_msg = f":{branch}" if branch else "" return f"{msg}{branch_msg}" @@ -124,9 +124,7 @@ def stash_revs(self) -> dict[str, ApplyStashEntry]: @classmethod def format_message(cls, head_rev: str, rev: str, name: Optional[str] = None) -> str: - return cls.MESSAGE_FORMAT.format( - head_rev=head_rev, rev=rev, name=name if name else "" - ) + return cls.MESSAGE_FORMAT.format(head_rev=head_rev, rev=rev, name=name or "") @contextmanager def preserve_workspace( diff --git a/dvc/repo/experiments/utils.py b/dvc/repo/experiments/utils.py index e1038d541a..d3b58850aa 100644 --- a/dvc/repo/experiments/utils.py +++ b/dvc/repo/experiments/utils.py @@ -200,7 +200,7 @@ def exp_commits( ) -> Iterable[str]: """Iterate over all experiment commits.""" shas: set[str] = set() - refs = ref_infos if ref_infos else exp_refs(scm) + refs = ref_infos or exp_refs(scm) for ref_info in refs: shas.update(scm.branch_revs(str(ref_info), ref_info.baseline_sha)) yield from shas diff --git a/tests/func/experiments/test_experiments.py b/tests/func/experiments/test_experiments.py index 7e634f340a..99a6b29fda 100644 --- a/tests/func/experiments/test_experiments.py +++ b/tests/func/experiments/test_experiments.py @@ -53,7 +53,7 @@ def test_new_simple(tmp_dir, scm, dvc, exp_stage, mocker, name, workspace): if workspace: assert (tmp_dir / "metrics.yaml").read_text().strip() == "foo: 2" - exp_name = name if name else ref_info.name + exp_name = name or ref_info.name assert dvc.experiments.get_exact_name([exp])[exp] == exp_name assert resolve_rev(scm, exp_name) == exp diff --git a/tests/func/experiments/test_save.py b/tests/func/experiments/test_save.py index c2ed3afe1b..9639d3ee44 100644 --- a/tests/func/experiments/test_save.py +++ b/tests/func/experiments/test_save.py @@ -28,7 +28,7 @@ def test_exp_save(tmp_dir, dvc, scm, name): assert ref_info assert ref_info.baseline_sha == baseline - exp_name = name if name else ref_info.name + exp_name = name or ref_info.name assert dvc.experiments.get_exact_name([exp])[exp] == exp_name assert resolve_rev(scm, exp_name) == exp diff --git a/tests/unit/command/test_diff.py b/tests/unit/command/test_diff.py index 2967481773..98faf285c9 100644 --- a/tests/unit/command/test_diff.py +++ b/tests/unit/command/test_diff.py @@ -196,7 +196,7 @@ def test_diff_show_markdown_and_hash(mocker, show_hash, dvc): cmd = args.func(args) diff = {} - show_hash = show_hash if show_hash else False + show_hash = show_hash or False mock_show_markdown = mocker.patch("dvc.commands.diff._show_markdown") mocker.patch("dvc.repo.Repo.diff", return_value=diff.copy())