Merge pull request #1047 from DimitriPapadopoulos/UP_FURB

Apply ruff/pyupgrade (UP) and ruff/refurb (FURB) rules

Author: RonnyPfannschmidt

src/setuptools_scm/_run_cmd.py

@@ -201,7 +201,7 @@ def has_command(
     else:
         res = not p.returncode
     if not res and warn:
-        warnings.warn("%r was not found" % name, category=RuntimeWarning)
+        warnings.warn(f"{name!r} was not found", category=RuntimeWarning)
     return res
 
 

src/setuptools_scm/git.py

@@ -2,6 +2,7 @@
 
 import dataclasses
 import logging
+import operator
 import os
 import re
 import shlex
@@ -144,8 +145,7 @@ def fetch_shallow(self) -> None:
         run_git(["fetch", "--unshallow"], self.path, check=True, timeout=240)
 
     def node(self) -> str | None:
-        def _unsafe_short_node(node: str) -> str:
-            return node[:7]
+        _unsafe_short_node = operator.itemgetter(slice(7))
 
         return run_git(
             ["rev-parse", "--verify", "--quiet", "HEAD"], self.path

src/setuptools_scm/version.py

@@ -216,7 +216,7 @@ def meta(
 ) -> ScmVersion:
     parsed_version = _parse_tag(tag, preformatted, config)
     log.info("version %s -> %s", tag, parsed_version)
-    assert parsed_version is not None, "Can't parse version %s" % tag
+    assert parsed_version is not None, f"Can't parse version {tag}"
     return ScmVersion(
         parsed_version,
         distance=distance,

testing/test_git.py

@@ -299,7 +299,7 @@ def test_git_dirty_notag(
 def test_git_worktree_support(wd: WorkDir, tmp_path: Path) -> None:
     wd.commit_testfile()
     worktree = tmp_path / "work_tree"
-    wd("git worktree add -b work-tree %s" % worktree)
+    wd(f"git worktree add -b work-tree {worktree}")
 
     res = run([sys.executable, "-m", "setuptools_scm", "ls"], cwd=worktree)
     assert "test.txt" in res.stdout

testing/test_version.py

@@ -432,10 +432,10 @@ def __init__(self, tag_str: str) -> None:
             self.tag = tag_str
 
         def __str__(self) -> str:
-            return "Custom %s" % self.tag
+            return f"Custom {self.tag}"
 
         def __repr__(self) -> str:
-            return "MyVersion<Custom%s>" % self.tag
+            return f"MyVersion<Custom{self.tag}>"
 
     config = Configuration(version_cls=MyVersion)  # type: ignore[arg-type]
     scm_version = meta("1.0.0-foo", config=config)