various fixes to ruff lint

Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>

Author: arthurzam

pyproject.toml

@@ -71,6 +71,12 @@ exclude = [
 line-length = 100
 target-version = "py311"
 
+[tool.ruff.lint.per-file-ignores]
+"tests/**" = [
+	"C408", # Unnecessary `dict()` call"
+	"SIM117", # multiple-with-statements
+]
+
 [tool.black]
 line-length = 100
 

src/pkgdev/mangle.py

@@ -6,7 +6,8 @@
 import re
 import signal
 import traceback
-from datetime import datetime
+from datetime import UTC, datetime
+from typing import ClassVar
 
 from pkgcore.ebuild.misc import sort_keywords
 from snakeoil.cli.exceptions import UserException
@@ -41,7 +42,7 @@ class Mangler:
     """File-mangling iterator using path-based parallelism."""
 
     # mapping of mangling types to functions
-    _mangle_funcs = {}
+    _mangle_funcs: ClassVar[dict[str, callable]] = {}
 
     def __init__(self, changes, skip_regex=None):
         self.jobs = os.cpu_count()
@@ -52,7 +53,7 @@ def __init__(self, changes, skip_regex=None):
         # setup for parallelizing the mangling procedure across files
         self._mp_ctx = multiprocessing.get_context("fork")
         self._mangled_paths_q = self._mp_ctx.SimpleQueue()
-        self._current_year = str(datetime.today().year)
+        self._current_year = str(datetime.now(tz=UTC).year)
 
         # initialize settings used by iterator support
         self._runner = self._mp_ctx.Process(target=self._run)

src/pkgdev/scripts/pkgdev_bugs.py

@@ -9,7 +9,7 @@
 import tomllib
 import urllib.request as urllib
 from collections import defaultdict
-from datetime import datetime
+from datetime import UTC, datetime
 from functools import partial
 from itertools import chain
 from os.path import join as pjoin
@@ -77,7 +77,7 @@ def __call__(self, parser, namespace, values, option_string=None):
             if not sys.stdin.isatty():
                 values = [x.strip() for x in sys.stdin.readlines() if x.strip()]
                 # reassign stdin to allow interactivity (currently only works for unix)
-                sys.stdin = open("/dev/tty")
+                sys.stdin = open("/dev/tty")  # noqa: SIM115
             else:
                 parser.error("'-' is only valid when piping data in")
 
@@ -408,11 +408,12 @@ def file_bug(
 
         description = [f"Please {self.category.verb}", ""]
         if modified_repo is not None:
+            now = datetime.now(tz=UTC)
             for pkg, _ in self.pkgs:
                 with contextlib.suppress(StopIteration):
                     match = next(modified_repo.itermatch(pkg.versioned_atom))
-                    modified = datetime.fromtimestamp(match.time)
-                    days_old = (datetime.today() - modified).days
+                    modified = datetime.fromtimestamp(match.time, tz=UTC)
+                    days_old = (now - modified).days
                     description.append(
                         f" {pkg.versioned_atom.cpvstr}: no change for {days_old} days, since {modified:%Y-%m-%d}"
                     )
@@ -889,19 +890,20 @@ def output_graph_toml(self):
             ):
                 toml.write(f"blocks = [{node_blocks}]\n")
             toml.write(f"obsoletes = {sorted(node.obsoletes)}\n")
+            now = datetime.now(tz=UTC)
             for pkg, arches in node.pkgs:
                 try:
                     match = next(self.modified_repo.itermatch(pkg.versioned_atom))
-                    modified = datetime.fromtimestamp(match.time)
-                    age = (datetime.today() - modified).days
+                    modified = datetime.fromtimestamp(match.time, tz=UTC)
+                    age = (now - modified).days
                     modified_text = f"{modified:%Y-%m-%d} (age {age} days)"
                 except StopIteration:
                     modified_text = "<unknown>"
 
                 try:
                     match = next(self.added_repo.itermatch(pkg.versioned_atom))
-                    added = datetime.fromtimestamp(match.time)
-                    age = (datetime.today() - added).days
+                    added = datetime.fromtimestamp(match.time, tz=UTC)
+                    age = (now - added).days
                     added_text = f"{added:%Y-%m-%d} (age {age} days)"
                 except StopIteration:
                     added_text = "<unknown>"
@@ -1177,7 +1179,7 @@ def _load_from_stdin(out: Formatter):
                 atom_str, *arches = line.split()
                 yield atom_str, parserestrict.parse_match(atom_str), frozenset(arches)
         # reassign stdin to allow interactivity (currently only works for unix)
-        sys.stdin = open("/dev/tty")
+        sys.stdin = open("/dev/tty")  # noqa: SIM115
     else:
         bugs.error("reading from stdin is only valid when piping data in")
 
@@ -1237,7 +1239,7 @@ def main(options, out: Formatter, err: Formatter):
             try:
                 subprocess.run(editor + [toml.name], check=True)
             except subprocess.CalledProcessError:
-                bugs.error("failed writing mask comment")
+                bugs.error("failed opening editor, aborting")
             except FileNotFoundError:
                 bugs.error(f"nonexistent editor: {editor[0]!r}")
             try:

src/pkgdev/scripts/pkgdev_commit.py

@@ -14,6 +14,7 @@
 from functools import partial
 from itertools import chain
 from os.path import join as pjoin
+from typing import ClassVar
 
 from pkgcheck import reporters, scan
 from pkgcore.ebuild.atom import MalformedAtom
@@ -384,7 +385,7 @@ def __str__(self):
 class MetadataSummary(ChangeSummary):
     """Summary generation support for metadata.xml changes."""
 
-    status_funcs = {}
+    status_funcs: ClassVar[dict[str, callable]] = {}
 
     def __init__(self, options, changes):
         super().__init__(options)
@@ -440,7 +441,7 @@ def modify(self):
 class PkgSummary(ChangeSummary):
     """Summary generation support for single package ebuild changes."""
 
-    status_funcs = {}
+    status_funcs: ClassVar[dict[str, callable]] = {}
 
     def __init__(self, options, changes):
         super().__init__(options)

src/pkgdev/scripts/pkgdev_mask.py

@@ -353,14 +353,13 @@ def _mask(options, out, err):
     email = p.stdout.strip()
 
     message = get_comment()
-    if options.file_bug:
-        if bug_no := file_last_rites_bug(options, message):
-            out.write(out.fg("green"), f"filed bug https://bugs.gentoo.org/{bug_no}", out.reset)
-            out.flush()
-            if not update_bugs_pmasked(options.bugzilla, options.bugs):
-                err.write(err.fg("red"), "failed to update referenced bugs", err.reset)
-                err.flush()
-            options.bugs.insert(0, bug_no)
+    if options.file_bug and (bug_no := file_last_rites_bug(options, message)):
+        out.write(out.fg("green"), f"filed bug https://bugs.gentoo.org/{bug_no}", out.reset)
+        out.flush()
+        if not update_bugs_pmasked(options.bugzilla, options.bugs):
+            err.write(err.fg("red"), "failed to update referenced bugs", err.reset)
+            err.flush()
+        options.bugs.insert(0, bug_no)
     if removal := message_removal_notice(options.bugs, options.rites):
         message.append(removal)
 

src/pkgdev/scripts/pkgdev_showkw.py

@@ -11,7 +11,6 @@
 from .. import cli
 from .._vendor.tabulate import tabulate, tabulate_formats
 
-
 showkw = cli.ArgumentParser(prog="pkgdev showkw", description="show package keywords")
 showkw.add_argument(
     "targets",
@@ -123,7 +122,7 @@ def _setup_arches(namespace, attr):
         if disabled_arches:
             arches = arches - disabled_arches
 
-    prefix_arches = set(x for x in arches if "-" in x)
+    prefix_arches = {x for x in arches if "-" in x}
     native_arches = arches.difference(prefix_arches)
     arches = native_arches
     if namespace.prefix:

tests/scripts/test_cli.py

@@ -1,9 +1,10 @@
 import textwrap
 
 import pytest
-from pkgdev import cli
 from snakeoil.cli import arghparse
 
+from pkgdev import cli
+
 
 class TestConfigFileParser:
     @pytest.fixture(autouse=True)

tests/scripts/test_pkgdev.py

@@ -19,7 +19,7 @@ def test_script_run(capsys):
             with pytest.raises(SystemExit) as excinfo:
                 script()
             assert excinfo.value.code == 1
-            out, err = capsys.readouterr()
+            _out, err = capsys.readouterr()
             err = err.strip().split("\n")
             assert len(err) == 3
             assert err[0] == "Failed importing: baz module doesn't exist!"
@@ -30,7 +30,7 @@ def test_script_run(capsys):
         with patch("sys.argv", [project, "--debug"]):
             with pytest.raises(ImportError):
                 script()
-            out, err = capsys.readouterr()
+            _out, err = capsys.readouterr()
             err = err.strip().split("\n")
             assert len(err) == 2
             assert err[0] == "Failed importing: baz module doesn't exist!"
@@ -47,5 +47,5 @@ def test_version(self, capsys):
             with pytest.raises(SystemExit) as excinfo:
                 self.script()
             assert excinfo.value.code == 0
-            out, err = capsys.readouterr()
+            out, _err = capsys.readouterr()
             assert out.startswith(project)

tests/scripts/test_pkgdev_commit.py

@@ -2,7 +2,7 @@
 import shutil
 import textwrap
 from contextlib import chdir
-from datetime import datetime
+from datetime import UTC, datetime
 from functools import partial
 from io import StringIO
 from os.path import join as pjoin
@@ -20,22 +20,22 @@ def test_non_repo_cwd(self, capsys, tool):
         with pytest.raises(SystemExit) as excinfo:
             tool.parse_args(["commit"])
         assert excinfo.value.code == 2
-        out, err = capsys.readouterr()
+        _out, err = capsys.readouterr()
         assert err.strip() == "pkgdev commit: error: not in ebuild repo"
 
     def test_bad_repo_cwd(self, make_repo, capsys, tool):
         repo = make_repo(masters=("nonexistent",))
         with pytest.raises(SystemExit) as excinfo, chdir(repo.location):
             tool.parse_args(["commit"])
         assert excinfo.value.code == 2
-        out, err = capsys.readouterr()
+        _out, err = capsys.readouterr()
         assert err.strip().startswith("pkgdev commit: error: repo init failed")
 
     def test_non_git_repo_cwd(self, repo, capsys, tool):
         with pytest.raises(SystemExit) as excinfo, chdir(repo.location):
             tool.parse_args(["commit"])
         assert excinfo.value.code == 2
-        out, err = capsys.readouterr()
+        _out, err = capsys.readouterr()
         assert err.strip() == "pkgdev commit: error: not in git repo"
 
     def test_non_ebuild_git_repo_cwd(self, make_repo, git_repo, capsys, tool):
@@ -44,7 +44,7 @@ def test_non_ebuild_git_repo_cwd(self, make_repo, git_repo, capsys, tool):
         with pytest.raises(SystemExit) as excinfo, chdir(repo.location):
             tool.parse_args(["commit"])
         assert excinfo.value.code == 2
-        out, err = capsys.readouterr()
+        _out, err = capsys.readouterr()
         assert err.strip() == "pkgdev commit: error: not in ebuild git repo"
 
     def test_commit_signing(self, repo, make_git_repo, tool):
@@ -1039,7 +1039,7 @@ def commit(args):
             with open(ebuild_path) as f:
                 lines = f.read().splitlines()
                 mo = copyright_regex.match(lines[0])
-                assert mo.group("end") == str(datetime.today().year)
+                assert mo.group("end") == str(datetime.now(tz=UTC).year)
                 assert mo.group("begin") == years[:4] + "-"
                 assert mo.group("holder") == "Gentoo Authors"
 

tests/scripts/test_pkgdev_manifest.py

@@ -2,7 +2,6 @@
 from contextlib import chdir
 from functools import partial
 from os.path import join as pjoin
-from typing import List, Set
 from unittest.mock import patch
 
 import pytest
@@ -16,7 +15,7 @@ def test_non_repo_cwd(self, capsys, tool):
         with pytest.raises(SystemExit) as excinfo:
             tool.parse_args(["manifest"])
         assert excinfo.value.code == 2
-        out, err = capsys.readouterr()
+        _out, err = capsys.readouterr()
         assert err.strip() == "pkgdev manifest: error: not in ebuild repo"
 
     @pytest.mark.skip
@@ -57,7 +56,7 @@ def test_repo_relative_outside(self, tmp_path, repo, capsys, tool):
             with chdir(repo.location):
                 tool.parse_args(["manifest", str(ebuild)])
         assert excinfo.value.code == 2
-        out, err = capsys.readouterr()
+        _out, err = capsys.readouterr()
         assert (
             err.strip()
             == f"pkgdev manifest: error: {repo.repo_id!r} repo doesn't contain: {str(ebuild)!r}"
@@ -86,7 +85,7 @@ def test_atom_target(self, repo, capsys, tool):
         assert matches == ["cat/pkg-0"]
 
     def test_if_modified_target(self, repo, make_git_repo, tool):
-        def manifest_matches() -> Set[str]:
+        def manifest_matches() -> set[str]:
             repo.sync()
             with chdir(repo.location):
                 options, _ = tool.parse_args(["manifest", "--if-modified"])
@@ -136,7 +135,7 @@ def manifest_matches() -> Set[str]:
 
     @pytest.mark.skip
     def test_ignore_fetch_restricted(self, repo, tool):
-        def manifest_matches() -> List[str]:
+        def manifest_matches() -> list[str]:
             with chdir(repo.location):
                 options, _ = tool.parse_args(["manifest", "--ignore-fetch-restricted"])
             return [x.cpvstr for x in repo.itermatch(options.restriction)]
@@ -161,14 +160,14 @@ def test_non_repo_dir_target(self, tmp_path, repo, capsys, tool):
         with pytest.raises(SystemExit) as excinfo, chdir(repo.location):
             tool.parse_args(["manifest", str(tmp_path)])
         assert excinfo.value.code == 2
-        out, err = capsys.readouterr()
+        _out, err = capsys.readouterr()
         assert err.startswith("pkgdev manifest: error: 'fake' repo doesn't contain:")
 
     def test_invalid_atom_target(self, repo, capsys, tool):
         with pytest.raises(SystemExit) as excinfo, chdir(repo.location):
             tool.parse_args(["manifest", "=cat/pkg"])
         assert excinfo.value.code == 2
-        out, err = capsys.readouterr()
+        _out, err = capsys.readouterr()
         assert err.startswith("pkgdev manifest: error: invalid atom: '=cat/pkg'")
 
 
@@ -207,7 +206,7 @@ def test_target_within_pkgdir(self, capsys, repo):
             ):
                 self.script()
             assert excinfo.value.code == 0
-            out, err = capsys.readouterr()
+            _out, err = capsys.readouterr()
             assert err == ""
 
     def test_good_manifest_quiet(self, capsys, repo):
@@ -222,24 +221,6 @@ def test_good_manifest_quiet(self, capsys, repo):
         out, err = capsys.readouterr()
         assert out == err == ""
 
-    def test_target_within_pkgdir(self, capsys, repo):
-        """Any file inside a package dir manifests that package."""
-        repo.create_ebuild("cat/pkg-0")
-        pkgdir = os.path.dirname(repo.create_ebuild("cat/pkg-1"))
-        os.makedirs(pjoin(pkgdir, "files"), exist_ok=True)
-        touch(pjoin(pkgdir, "files", "a.patch"))
-        for target in ("files/a.patch", "files", "metadata.xml"):
-            touch(pjoin(pkgdir, "metadata.xml"))
-            with (
-                patch("sys.argv", self.args + [target]),
-                pytest.raises(SystemExit) as excinfo,
-                chdir(pkgdir),
-            ):
-                self.script()
-            assert excinfo.value.code == 0
-            out, err = capsys.readouterr()
-            assert err == ""
-
     def test_bad_manifest(self, capsys, repo):
         repo.create_ebuild("cat/pkg-0")
         repo.create_ebuild("cat/pkg-1", eapi="-1")