Merge pull request #1096 from DimitriPapadopoulos/ruff_0.9.1

Bump ruff from 0.3.4 to 0.9.1

Author: RonnyPfannschmidt

.pre-commit-config.yaml

@@ -5,8 +5,9 @@ repos:
     -   id: trailing-whitespace
     -   id: check-yaml
     -   id: debug-statements
+
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.3.4
+  rev: v0.9.1
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix, --show-fixes]

pyproject.toml

@@ -118,7 +118,6 @@ version = { attr = "_own_version_helper.version"}
 
 [tool.ruff]
 src = ["src"]
-fix = true
 lint.select = ["E", "F", "B", "UP", "YTT", "C", "DTZ", "PYI", "PT", "I", "FURB", "RUF"]
 lint.ignore = ["B028"]
 lint.preview = true

src/setuptools_scm/_integration/setuptools.py

@@ -82,9 +82,9 @@ def version_keyword(
         assert isinstance(value, dict), "version_keyword expects a dict or True"
         overrides = value
 
-    assert (
-        "dist_name" not in overrides
-    ), "dist_name may not be specified in the setup keyword "
+    assert "dist_name" not in overrides, (
+        "dist_name may not be specified in the setup keyword "
+    )
     dist_name: str | None = dist.metadata.name
     _log_hookstart("version_keyword", dist)
 

src/setuptools_scm/git.py

@@ -145,12 +145,12 @@ def fetch_shallow(self) -> None:
         run_git(["fetch", "--unshallow"], self.path, check=True, timeout=240)
 
     def node(self) -> str | None:
-        _unsafe_short_node = operator.itemgetter(slice(7))
+        unsafe_short_node = operator.itemgetter(slice(7))
 
         return run_git(
             ["rev-parse", "--verify", "--quiet", "HEAD"], self.path
         ).parse_success(
-            parse=_unsafe_short_node,
+            parse=unsafe_short_node,
         )
 
     def count_all_nodes(self) -> int:
@@ -250,7 +250,7 @@ def parse_describe(output: str) -> ScmVersion:
 def _git_parse_inner(
     config: Configuration,
     wd: GitWorkdir | hg_git.GitWorkdirHgClient,
-    pre_parse: None | (Callable[[GitWorkdir | hg_git.GitWorkdirHgClient], None]) = None,
+    pre_parse: (Callable[[GitWorkdir | hg_git.GitWorkdirHgClient], None]) | None = None,
     describe_command: _t.CMD_TYPE | None = None,
 ) -> ScmVersion:
     if pre_parse:

src/setuptools_scm/integration.py

@@ -10,7 +10,7 @@
 log = logging.getLogger(__name__)
 
 
-def data_from_mime(path: _t.PathT, content: None | str = None) -> dict[str, str]:
+def data_from_mime(path: _t.PathT, content: str | None = None) -> dict[str, str]:
     """return a mapping from mime/pseudo-mime content
     :param path: path to the mime file
     :param content: content of the mime file, if None, read from path

src/setuptools_scm/version.py

@@ -381,8 +381,7 @@ def guess_next_date_ver(
         if tag_date > head_date and match is not None:
             # warn on future times
             warnings.warn(
-                f"your previous tag  ({tag_date})"
-                f" is ahead your node date ({head_date})"
+                f"your previous tag  ({tag_date}) is ahead your node date ({head_date})"
             )
         patch = 0
     next_version = "{node_date:{date_fmt}}.{patch}".format(

testing/conftest.py

@@ -79,14 +79,14 @@ def debug_mode() -> Iterator[DebugMode]:
         yield debug_mode
 
 
-@pytest.fixture()
+@pytest.fixture
 def wd(tmp_path: Path) -> WorkDir:
     target_wd = tmp_path.resolve() / "wd"
     target_wd.mkdir()
     return WorkDir(target_wd)
 
 
-@pytest.fixture()
+@pytest.fixture
 def repositories_hg_git(tmp_path: Path) -> tuple[WorkDir, WorkDir]:
     tmp_path = tmp_path.resolve()
     path_git = tmp_path / "repo_git"

testing/test_file_finder.py

@@ -212,7 +212,7 @@ def test_symlink_not_in_scm_while_target_is(inwd: WorkDir) -> None:
 
 
 @pytest.mark.issue(587)
-@pytest.mark.skip_commit()
+@pytest.mark.skip_commit
 def test_not_commited(inwd: WorkDir) -> None:
     assert find_files() == []
 

testing/test_functions.py

@@ -81,7 +81,7 @@ def test_dump_version_doesnt_bail_on_value_error(tmp_path: Path) -> None:
     write_to = "VERSION"
     version = str(VERSIONS["exact"].tag)
     scm_version = meta(VERSIONS["exact"].tag, config=c)
-    with pytest.raises(ValueError, match="^bad file format:"):
+    with pytest.raises(ValueError, match=r"^bad file format:"):
         dump_version(tmp_path, version, write_to, scm_version=scm_version)
 
 

testing/test_git.py

@@ -307,7 +307,7 @@ def test_git_worktree_support(wd: WorkDir, tmp_path: Path) -> None:
     assert str(worktree) in res.stdout
 
 
-@pytest.fixture()
+@pytest.fixture
 def shallow_wd(wd: WorkDir, tmp_path: Path) -> Path:
     wd.commit_testfile()
     wd.commit_testfile()
@@ -515,7 +515,7 @@ def test_git_getdate_git_2_45_0_plus(
         assert git_wd.get_head_date() == date(2024, 4, 30)
 
 
-@pytest.fixture()
+@pytest.fixture
 def signed_commit_wd(monkeypatch: pytest.MonkeyPatch, wd: WorkDir) -> WorkDir:
     if not has_command("gpg", args=["--version"], warn=False):
         pytest.skip("gpg executable not found")