fix mypy and ruff errors

Author: skshetry

dvc/repo/scm_context.py

@@ -10,6 +10,8 @@
 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 @@ def ignore_remove(self, path: str) -> None:
     @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 @@ def __call__(
 
         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

dvc/testing/path_info.py

@@ -2,7 +2,7 @@
 import pathlib
 import posixpath
 import sys
-from typing import Callable, ClassVar
+from typing import Callable, ClassVar, Union
 from urllib.parse import urlparse
 
 from dvc.utils import relpath
@@ -79,15 +79,17 @@ def isin(self, other):
             and self._cparts[:n] == other._cparts  # type: ignore[attr-defined]
         )
 
-    def relative_to(self, other, *args, **kwargs):
+    def relative_to(
+        self, *other: Union[str, "os.PathLike[str]"], **kwargs
+    ) -> "PathInfo":
         # pathlib relative_to raises exception when one path is not a direct
         # descendant of the other when os.path.relpath would return abspath.
         # For DVC PathInfo we only need the relpath behavior.
         # See: https://bugs.python.org/issue40358
         try:
-            path = super().relative_to(other, *args, **kwargs)
+            path = super().relative_to(*other, **kwargs)
         except ValueError:
-            path = relpath(self, other)
+            path = relpath(self, other[0])
         return self.__class__(path)
 
 

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 "