Bump dev dependencies, including ruff 0.4.2, f-string tweaks (#460)

Author: tony

CHANGES

@@ -24,6 +24,9 @@ $ pip install --user --upgrade --pre libvcs
 - poetry: 1.8.1 -> 1.8.2
 
   See also: https://github.com/python-poetry/poetry/blob/1.8.2/CHANGELOG.md
+- Code quality: Use f-strings in more places (#460)
+
+  via [ruff 0.4.2](https://github.com/astral-sh/ruff/blob/v0.4.2/CHANGELOG.md).
 
 ## libvcs 0.29.0 (2024-03-24)
 

docs/conf.py

@@ -57,8 +57,8 @@
 project = about["__title__"]
 project_copyright = about["__copyright__"]
 
-version = "%s" % (".".join(about["__version__"].split("."))[:2])
-release = "%s" % (about["__version__"])
+version = "{}".format(".".join(about["__version__"].split("."))[:2])
+release = "{}".format(about["__version__"])
 
 exclude_patterns = ["_build"]
 

poetry.lock

@@ -133,4 +133,5 @@ def is_vcs(val: t.Any) -> "TypeGuard[VCSLiteral]":
             progress_callback=progress_callback,
             **kwargs,
         )
-    raise InvalidVCS("VCS %s is not a valid VCS" % vcs)
+    msg = f"VCS {vcs} is not a valid VCS"
+    raise InvalidVCS(msg)

src/libvcs/_internal/shortcuts.py

@@ -27,7 +27,7 @@ def __str__(self) -> str:
         """Return command output."""
         message = self.message.format(returncode=self.returncode, cmd=self.cmd)
         if len(self.output.strip()):
-            message += "\n%s" % self.output
+            message += f"\n{self.output}"
         return message
 
     message = "Command failed with code {returncode}: {cmd}"

src/libvcs/exc.py

@@ -393,9 +393,9 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
             self.log.debug("No git revision set, defaulting to origin/master")
             symref = self.cmd.symbolic_ref(name="HEAD", short=True)
             git_tag = symref.rstrip() if symref else "origin/master"
-        self.log.debug("git_tag: %s" % git_tag)
+        self.log.debug(f"git_tag: {git_tag}")
 
-        self.log.info("Updating to '%s'." % git_tag)
+        self.log.info(f"Updating to '{git_tag}'.")
 
         # Get head sha
         try:
@@ -408,14 +408,14 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
             self.log.exception("Failed to get the hash for HEAD")
             return
 
-        self.log.debug("head_sha: %s" % head_sha)
+        self.log.debug(f"head_sha: {head_sha}")
 
         # If a remote ref is asked for, which can possibly move around,
         # we must always do a fetch and checkout.
         show_ref_output = self.cmd.show_ref(pattern=git_tag, check_returncode=False)
-        self.log.debug("show_ref_output: %s" % show_ref_output)
+        self.log.debug(f"show_ref_output: {show_ref_output}")
         is_remote_ref = "remotes" in show_ref_output
-        self.log.debug("is_remote_ref: %s" % is_remote_ref)
+        self.log.debug(f"is_remote_ref: {is_remote_ref}")
 
         # show-ref output is in the form "<sha> refs/remotes/<remote>/<tag>"
         # we must strip the remote from the tag.
@@ -433,8 +433,8 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
                 raise GitRemoteRefNotFound(git_tag=git_tag, ref_output=show_ref_output)
             git_remote_name = m.group("git_remote_name")
             git_tag = m.group("git_tag")
-        self.log.debug("git_remote_name: %s" % git_remote_name)
-        self.log.debug("git_tag: %s" % git_tag)
+        self.log.debug(f"git_remote_name: {git_remote_name}")
+        self.log.debug(f"git_tag: {git_tag}")
 
         # This will fail if the tag does not exist (it probably has not
         # been fetched yet).
@@ -448,7 +448,7 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
         except exc.CommandError as e:
             error_code = e.returncode if e.returncode is not None else 0
             tag_sha = ""
-        self.log.debug("tag_sha: %s" % tag_sha)
+        self.log.debug(f"tag_sha: {tag_sha}")
 
         # Is the hash checkout out what we want?
         somethings_up = (error_code, is_remote_ref, tag_sha != head_sha)
@@ -459,7 +459,7 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
         try:
             process = self.cmd.fetch(log_in_real_time=True, check_returncode=True)
         except exc.CommandError:
-            self.log.exception("Failed to fetch repository '%s'" % url)
+            self.log.exception(f"Failed to fetch repository '{url}'")
             return
 
         if is_remote_ref:
@@ -485,7 +485,7 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
             try:
                 process = self.cmd.checkout(branch=git_tag)
             except exc.CommandError:
-                self.log.exception("Failed to checkout tag: '%s'" % git_tag)
+                self.log.exception(f"Failed to checkout tag: '{git_tag}'")
                 return
 
             # Rebase changes from the remote branch
@@ -501,8 +501,8 @@ def update_repo(self, set_remotes: bool = False, *args: Any, **kwargs: Any) -> N
                         self.cmd.stash.pop(index=True, quiet=True)
 
                     self.log.exception(
-                        "\nFailed to rebase in: '%s'.\n"
-                        "You will have to resolve the conflicts manually" % self.path,
+                        f"\nFailed to rebase in: '{self.path}'.\n"
+                        "You will have to resolve the conflicts manually",
                     )
                     return
 

src/libvcs/sync/git.py

@@ -24,7 +24,7 @@ def test_command_error() -> None:
             returncode=e.value.returncode,
             cmd=e.value.cmd,
         )
-        + "\n%s" % e.value.output
+        + f"\n{e.value.output}"
     )
 
     with pytest.raises(exc.CommandError) as e: