fix: use Self return type for SCMContext.__enter__ and __call__

Return self directly in __enter__ instead of the @contextmanager's
__enter__() return value. Also update __call__ to return
Iterator[Self]. They're semantically identical (the contextmanager
yields self), but this satisfies both ruff PYI034 and mypy.

https://claude.ai/code/session_01M18n2k6KLenwMRANgSFMXc

.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.0'
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]

dvc/__pyinstaller/hook-celery.py

@@ -8,7 +8,7 @@ from PyInstaller.utils.hooks import collect_submodules, is_module_or_submodule
 _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)
     ),
 )

dvc/repo/experiments/__init__.py

@@ -188,7 +188,7 @@ class Experiments:
         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(

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

dvc/repo/experiments/executor/base.py

@@ -757,7 +757,7 @@ class BaseExecutor(ABC):
             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

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)

dvc/repo/experiments/stash.py

@@ -67,7 +67,7 @@ class ExpStash(Stash):
         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 @@ class ApplyStash(Stash):
 
     @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(

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

dvc/repo/scm_context.py

@@ -10,6 +10,8 @@ from dvc.utils import relpath
 from dvc.utils.collections import ensure_list
 
 if TYPE_CHECKING:
+    from typing_extensions import Self
+
     from dvc.repo import Repo
     from dvc.scm import Base
 
@@ -96,7 +98,7 @@ class SCMContext:
     @contextmanager
     def __call__(
         self, autostage: Optional[bool] = None, quiet: Optional[bool] = None
-    ) -> Iterator["SCMContext"]:
+    ) -> Iterator["Self"]:
         try:
             yield self
         except Exception:
@@ -131,9 +133,10 @@ class SCMContext:
 
         self.files_to_track = set()
 
-    def __enter__(self) -> "SCMContext":
+    def __enter__(self) -> "Self":
         self._cm = self()
-        return self._cm.__enter__()
+        self._cm.__enter__()
+        return self
 
     def __exit__(self, *exc_args) -> None:
         assert self._cm

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
 

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
 

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())
 

tests/unit/command/test_help.py

@@ -47,7 +47,7 @@ def test_help(caplog, capsys, command_tuples):
     out, err = capsys.readouterr()
 
     # validate metavars are all in lowercase
-    usage = "\n".join(takewhile(lambda o: bool(o), out.splitlines()))
+    usage = "\n".join(takewhile(bool, out.splitlines()))
 
     message = (
         "metavars not lowercased, you are likely missing formatter_class=XXX "