ruff . --select COM --fix

Author: tony

docs/conf.py

@@ -97,7 +97,7 @@
         "sidebar/navigation.html",
         "sidebar/projects.html",
         "sidebar/scroll-end.html",
-    ]
+    ],
 }
 
 # linkify_issues

src/libvcs/_internal/module_loading.py

@@ -108,6 +108,6 @@ def import_string(import_name: str, silent: bool = False) -> t.Any:
     except ImportError as e:
         if not silent:
             raise ImportStringError(import_name, e).with_traceback(
-                sys.exc_info()[2]
+                sys.exc_info()[2],
             ) from None
     return None

src/libvcs/_internal/run.py

@@ -65,7 +65,7 @@ def __init__(self, bin_name: str, keyword: str, *args: Any, **kwargs: Any) -> No
         logging.LoggerAdapter.__init__(self, *args, **kwargs)
 
     def process(
-        self, msg: str, kwargs: MutableMapping[str, Any]
+        self, msg: str, kwargs: MutableMapping[str, Any],
     ) -> tuple[Any, MutableMapping[str, Any]]:
         """Add additional context information for loggers."""
         prefixed_dict = {}
@@ -89,7 +89,7 @@ def __call__(self, output: AnyStr, timestamp: datetime.datetime) -> None:
     _ENV: "TypeAlias" = Mapping[str, str]
 else:
     _ENV: "TypeAlias" = Union[
-        Mapping[bytes, StrOrBytesPath], Mapping[str, StrOrBytesPath]
+        Mapping[bytes, StrOrBytesPath], Mapping[str, StrOrBytesPath],
     ]
 
 _CMD = Union[StrOrBytesPath, Sequence[StrOrBytesPath]]

src/libvcs/_internal/subprocess.py

@@ -73,7 +73,7 @@ def __init__(self, output: str, *args: object):
     _ENV: "TypeAlias" = Mapping[str, str]
 else:
     _ENV: "TypeAlias" = Union[
-        Mapping[bytes, StrOrBytesPath], Mapping[str, StrOrBytesPath]
+        Mapping[bytes, StrOrBytesPath], Mapping[str, StrOrBytesPath],
     ]
 _FILE: "TypeAlias" = Union[None, int, IO[Any]]
 _TXT: "TypeAlias" = Union[bytes, str]

src/libvcs/_internal/types.py

@@ -16,7 +16,7 @@
 """:class:`os.PathLike` or :class:`str`"""
 
 StrOrBytesPath: "TypeAlias" = Union[
-    str, bytes, PathLike[str], PathLike[bytes]  # stable
+    str, bytes, PathLike[str], PathLike[bytes],  # stable
 ]
 """:class:`os.PathLike`, :class:`str` or :term:`bytes-like object`"""
 

src/libvcs/cmd/git.py

@@ -733,7 +733,7 @@ def rebase(
             local_flags.append("--quit")
 
         return self.run(
-            ["rebase", *local_flags, *required_flags], check_returncode=check_returncode
+            ["rebase", *local_flags, *required_flags], check_returncode=check_returncode,
         )
 
     def pull(

src/libvcs/pytest_plugin.py

@@ -25,26 +25,26 @@ class MaxUniqueRepoAttemptsExceeded(exc.LibVCSException):
     def __init__(self, attempts: int, *args: object):
         """Raise LibVCSException exception with message including attempts tried."""
         return super().__init__(
-            f"Could not find unused repo destination (attempts: {attempts})"
+            f"Could not find unused repo destination (attempts: {attempts})",
         )
 
 
 skip_if_git_missing = pytest.mark.skipif(
-    not shutil.which("git"), reason="git is not available"
+    not shutil.which("git"), reason="git is not available",
 )
 skip_if_svn_missing = pytest.mark.skipif(
-    not shutil.which("svn"), reason="svn is not available"
+    not shutil.which("svn"), reason="svn is not available",
 )
 skip_if_hg_missing = pytest.mark.skipif(
-    not shutil.which("hg"), reason="hg is not available"
+    not shutil.which("hg"), reason="hg is not available",
 )
 
 
 class RandomStrSequence:
     """Create a random string sequence."""
 
     def __init__(
-        self, characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_"
+        self, characters: str = "abcdefghijklmnopqrstuvwxyz0123456789_",
     ) -> None:
         self.characters: str = characters
 
@@ -119,7 +119,7 @@ def gitconfig(user_path: pathlib.Path, set_home: pathlib.Path) -> pathlib.Path:
     name = {getpass.getuser()}
   [color]
     diff = auto
-    """
+    """,
         ),
         encoding="utf-8",
     )
@@ -132,7 +132,7 @@ def gitconfig(user_path: pathlib.Path, set_home: pathlib.Path) -> pathlib.Path:
             "--show-origin",
             "--get",
             "user.email",
-        ]
+        ],
     )
     assert str(gitconfig) in used_config_file_output
     assert user_email in output, "Should use our fixture config and home directory"
@@ -154,7 +154,7 @@ def hgconfig(user_path: pathlib.Path, set_home: pathlib.Path) -> pathlib.Path:
 
         [trusted]
         users = {getpass.getuser()}
-    """
+    """,
         ),
         encoding="utf-8",
     )
@@ -163,7 +163,7 @@ def hgconfig(user_path: pathlib.Path, set_home: pathlib.Path) -> pathlib.Path:
 
 @pytest.fixture(scope="function")
 def projects_path(
-    user_path: pathlib.Path, request: pytest.FixtureRequest
+    user_path: pathlib.Path, request: pytest.FixtureRequest,
 ) -> pathlib.Path:
     """User's local checkouts and clones. Emphemeral directory."""
     dir = user_path / "projects"
@@ -178,7 +178,7 @@ def clean() -> None:
 
 @pytest.fixture(scope="function")
 def remote_repos_path(
-    user_path: pathlib.Path, request: pytest.FixtureRequest
+    user_path: pathlib.Path, request: pytest.FixtureRequest,
 ) -> pathlib.Path:
     """System's remote (file-based) repos to clone andpush to. Emphemeral directory."""
     dir = user_path / "remote_repos"
@@ -330,7 +330,7 @@ def svn_remote_repo_single_commit_post_init(remote_repo_path: pathlib.Path) -> N
                 str(remote_repo_path),
                 "<",
                 str(repo_dumpfile),
-            ]
+            ],
         ),
         shell=True,
     )
@@ -431,7 +431,7 @@ def fn(
 @pytest.fixture
 @skip_if_hg_missing
 def hg_remote_repo(
-    remote_repos_path: pathlib.Path, hgconfig: pathlib.Path
+    remote_repos_path: pathlib.Path, hgconfig: pathlib.Path,
 ) -> pathlib.Path:
     """Pre-made, file-based repo for push and pull."""
     return _create_hg_remote_repo(
@@ -452,7 +452,7 @@ def git_repo(projects_path: pathlib.Path, git_remote_repo: pathlib.Path) -> GitS
                 name="origin",
                 push_url=f"file://{git_remote_repo}",
                 fetch_url=f"file://{git_remote_repo}",
-            )
+            ),
         },
     )
     git_repo.obtain()

src/libvcs/sync/base.py

@@ -118,7 +118,7 @@ def __init__(
 
         #: Logging attribute
         self.log: CmdLoggingAdapter = CmdLoggingAdapter(
-            bin_name=self.bin_name, keyword=self.repo_name, logger=logger, extra={}
+            bin_name=self.bin_name, keyword=self.repo_name, logger=logger, extra={},
         )
 
     @property
@@ -190,7 +190,7 @@ def ensure_dir(self, *args: Any, **kwargs: Any) -> bool:
 
         if not self.dir.exists():
             self.log.debug(
-                f"Project directory for {self.repo_name} does not exist @ {self.dir}"
+                f"Project directory for {self.repo_name} does not exist @ {self.dir}",
             )
             self.dir.mkdir(parents=True)
 

src/libvcs/sync/git.py

@@ -39,7 +39,7 @@ class GitStatusParsingException(exc.LibVCSException):
 
     def __init__(self, git_status_output: str, *args: object):
         return super().__init__(
-            "Could not find match for git-status(1)" + f"Output: {git_status_output}"
+            "Could not find match for git-status(1)" + f"Output: {git_status_output}",
         )
 
 
@@ -70,7 +70,7 @@ class GitRemoteRefNotFound(exc.CommandError):
     def __init__(self, git_tag: str, ref_output: str, *args: object):
         return super().__init__(
             f"Could not fetch remote in refs/remotes/{git_tag}:"
-            + f"Output: {ref_output}"
+            + f"Output: {ref_output}",
         )
 
 
@@ -174,8 +174,8 @@ def convert_pip_url(pip_url: str) -> VCSLocation:
         raise exc.LibVCSException(
             "Repo {} is malformatted, please use the convention {} for "
             "ssh / private GitHub repositories.".format(
-                pip_url, "git+https://github.com/username/repo.git"
-            )
+                pip_url, "git+https://github.com/username/repo.git",
+            ),
         )
     else:
         url, rev = base_convert_pip_url(pip_url)
@@ -192,7 +192,7 @@ class GitSync(BaseSync):
     _remotes: GitSyncRemoteDict
 
     def __init__(
-        self, *, url: str, dir: StrPath, remotes: GitRemotesArgs = None, **kwargs: Any
+        self, *, url: str, dir: StrPath, remotes: GitRemotesArgs = None, **kwargs: Any,
     ) -> None:
         """Local git repository.
 
@@ -248,7 +248,7 @@ def __init__(
 
         if remotes is None:
             self._remotes: GitSyncRemoteDict = {
-                "origin": GitRemote(name="origin", fetch_url=url, push_url=url)
+                "origin": GitRemote(name="origin", fetch_url=url, push_url=url),
             }
         elif isinstance(remotes, dict):
             self._remotes = {}
@@ -265,7 +265,7 @@ def __init__(
                             "fetch_url": remote_url["fetch_url"],
                             "push_url": remote_url["push_url"],
                             "name": remote_name,
-                        }
+                        },
                     )
                 elif isinstance(remote_url, GitRemote):
                     self._remotes[remote_name] = remote_url
@@ -396,7 +396,7 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
         # Get head sha
         try:
             head_sha = self.cmd.rev_list(
-                commit="HEAD", max_count=1, check_returncode=True
+                commit="HEAD", max_count=1, check_returncode=True,
             )
         except exc.CommandError:
             self.log.exception("Failed to get the hash for HEAD")
@@ -496,7 +496,7 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
 
                     self.log.exception(
                         "\nFailed to rebase in: '%s'.\n"
-                        "You will have to resolve the conflicts manually" % self.dir
+                        "You will have to resolve the conflicts manually" % self.dir,
                     )
                     return
 
@@ -515,7 +515,7 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
                         self.log.exception(
                             f"\nFailed to rebase in: '{self.dir}'.\n"
                             + "You will have to resolve the "
-                            + "conflicts manually"
+                            + "conflicts manually",
                         )
                         return
 
@@ -565,22 +565,22 @@ def remote(self, name: str, **kwargs: Any) -> Optional[GitRemote]:
         """
         try:
             ret = self.cmd.remote.show(
-                name=name, no_query_remotes=True, log_in_real_time=True
+                name=name, no_query_remotes=True, log_in_real_time=True,
             )
             lines = ret.split("\n")
             remote_fetch_url = lines[1].replace("Fetch URL: ", "").strip()
             remote_push_url = lines[2].replace("Push  URL: ", "").strip()
             if remote_fetch_url != name and remote_push_url != name:
                 return GitRemote(
-                    name=name, fetch_url=remote_fetch_url, push_url=remote_push_url
+                    name=name, fetch_url=remote_fetch_url, push_url=remote_push_url,
                 )
             else:
                 return None
         except exc.LibVCSException:
             return None
 
     def set_remote(
-        self, name: str, url: str, push: bool = False, overwrite: bool = False
+        self, name: str, url: str, push: bool = False, overwrite: bool = False,
     ) -> GitRemote:
         """Set remote with name and URL like git remote add.
 
@@ -670,7 +670,7 @@ def status(self) -> GitStatus:
 )
         """
         return GitStatus.from_stdout(
-            self.cmd.status(short=True, branch=True, porcelain="2")
+            self.cmd.status(short=True, branch=True, porcelain="2"),
         )
 
     def get_current_remote_name(self) -> str:

src/libvcs/sync/svn.py

@@ -141,7 +141,7 @@ def get_revision(self, location: Optional[str] = None) -> int:
         return revision
 
     def update_repo(
-        self, dest: Optional[str] = None, *args: Any, **kwargs: Any
+        self, dest: Optional[str] = None, *args: Any, **kwargs: Any,
     ) -> None:
         """Fetch changes from SVN repository to local working copy."""
         self.ensure_dir()
@@ -193,7 +193,7 @@ def _get_svn_url_rev(cls, location: str) -> tuple[Optional[str], int]:
                 # is being used to prompt for passwords, because passwords
                 # are only potentially needed for remote server requests.
                 xml = Svn(dir=pathlib.Path(location).parent).info(
-                    target=pathlib.Path(location), xml=True
+                    target=pathlib.Path(location), xml=True,
                 )
                 match = _svn_info_xml_url_re.search(xml)
                 assert match is not None