enable ruff linter

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

Author: arthurzam

.github/workflows/test.yml

@@ -126,6 +126,10 @@ jobs:
     - name: Run linting tools
       run: pylint --exit-zero src/pkgcheck
 
+    - uses: astral-sh/ruff-action@v3
+      with:
+        args: "check --check --diff"
+
   format:
     runs-on: ubuntu-latest
     if: inputs.disable-format-check == ''

pyproject.toml

@@ -89,6 +89,9 @@ line-length = 100
 target-version = "py311"
 [tool.ruff.lint]
 extend-select = ["I"]
+ignore = [
+	"E741",  # ambiguous variable name
+]
 
 [tool.black]
 line-length = 100

src/pkgcheck/checks/imlate.py

@@ -105,14 +105,14 @@ def feed(self, pkgset):
                 lagging -= {"~" + x for x in newer_slot_stables}
                 lagging -= stable
                 if lagging:
-                    stable_kwds = (x for x in pkg.keywords if not x[0] in ("~", "-"))
+                    stable_kwds = (x for x in pkg.keywords if x[0] not in ("~", "-"))
                     yield LaggingStable(slot, sorted(stable_kwds), sorted(lagging), pkg=pkg)
 
                 unstable_keywords = {x for x in pkg.keywords if x[0] == "~"}
                 potential = self.target_arches.intersection(unstable_keywords)
                 potential -= lagging | stable
                 if potential:
-                    stable_kwds = (x for x in pkg.keywords if not x[0] in ("~", "-"))
+                    stable_kwds = (x for x in pkg.keywords if x[0] not in ("~", "-"))
                     yield PotentialStable(slot, sorted(stable_kwds), sorted(potential), pkg=pkg)
 
                 break

src/pkgcheck/checks/network.py

@@ -388,10 +388,10 @@ def _provenance_check(self, filename, url, *, pkg):
         result = None
         try:
             self.session.head(url, allow_redirects=False)
-        except RequestError as e:
+        except RequestError:
             pass
         except SSLError as e:
-            result = SSLCertificateError(attr, url, str(e), pkg=pkg)
+            result = SSLCertificateError("SRC_URI", url, str(e), pkg=pkg)
         else:
             result = PyPIAttestationAvailable(filename, pkg=pkg)
         return result

src/pkgcheck/reporters.py

@@ -177,7 +177,9 @@ class JsonReporter(StreamReporter):
 
     def _consume_reports_generator(self) -> T_process_report:
         # arbitrarily nested defaultdicts
-        json_dict = lambda: defaultdict(json_dict)
+        def json_dict():
+            return defaultdict(json_dict)
+
         # scope to data conversion mapping
         scope_map = {
             base.version_scope: lambda data, r: data[r.category][r.package][r.version],

src/pkgcheck/scripts/argparse_actions.py

@@ -282,8 +282,10 @@ class KeywordArgs(arghparse.CommaSeparatedNegations):
     """Filter enabled keywords by selected keywords."""
 
     def __call__(self, parser, namespace, values, option_string=None):
+        def replace_aliases(x):
+            return objects.KEYWORDS.aliases.get(x, [x])
+
         disabled, enabled = self.parse_values(values)
-        replace_aliases = lambda x: objects.KEYWORDS.aliases.get(x, [x])
 
         # expand keyword aliases to keyword lists
         disabled = list(chain.from_iterable(map(replace_aliases, disabled)))

tests/checks/test_metadata.py

@@ -408,26 +408,26 @@ def test_repo_with_no_settings(self):
             self.assertNoReport(check, self.mk_pkg(eapi=eapi_str))
 
     def test_unknown_eapis(self):
-        for eapi in ("blah", "9999"):
+        for eapi_val in ("blah", "9999"):
             check = self.mk_check()
             pkg_path = pjoin(self.repo.location, "dev-util", "foo")
             os.makedirs(pkg_path)
             with open(pjoin(pkg_path, "foo-0.ebuild"), "w") as f:
-                f.write(f"EAPI={eapi}\n")
+                f.write(f"EAPI={eapi_val}\n")
             r = self.assertReport(check, self.repo)
             assert isinstance(r, metadata.InvalidEapi)
-            assert f"EAPI '{eapi}' is not supported" in str(r)
+            assert f"EAPI '{eapi_val}' is not supported" in str(r)
 
     def test_invalid_eapis(self):
-        for eapi in ("invalid!", "${EAPI}"):
+        for eapi_val in ("invalid!", "${EAPI}"):
             check = self.mk_check()
             pkg_path = pjoin(self.repo.location, "dev-util", "foo")
             os.makedirs(pkg_path)
             with open(pjoin(pkg_path, "foo-0.ebuild"), "w") as f:
-                f.write(f"EAPI={eapi}\n")
+                f.write(f"EAPI={eapi_val}\n")
             r = self.assertReport(check, self.repo)
             assert isinstance(r, metadata.InvalidEapi)
-            assert f"invalid EAPI '{eapi}'" in str(r)
+            assert f"invalid EAPI '{eapi_val}'" in str(r)
 
     def test_sourcing_error(self):
         check = self.mk_check()
@@ -619,7 +619,6 @@ def test_required_addons(self):
         def mk_check(self, *args, options=None, **kwargs):
             options = options if options is not None else {}
             options = self.get_options(**options)
-            profiles = [misc.FakeProfile(iuse_effective=["x86"])]
             use_addon = addons.UseAddon(options)
             check = self.check_kls(options, *args, use_addon=use_addon, **kwargs)
             return check
@@ -1378,5 +1377,5 @@ def test_with_multiple_unpackers_one_missing(self):
             self.mk_check(), self.mk_pkg([".zip", ".7z"], DEPEND="app-arch/unzip")
         )
         assert isinstance(r, metadata.MissingUnpackerDep)
-        assert r.filenames == (f"diffball-2.7.1.7z",)
+        assert r.filenames == ("diffball-2.7.1.7z",)
         assert r.unpackers == ("app-arch/7zip",)

tests/scripts/test_pkgcheck_scan.py

@@ -604,7 +604,7 @@ def _load_expected_data(self, base: pathlib.Path) -> _expected_data_result:
 
         custom_handler = None
         try:
-            with (custom_handler_path := base / "handler.py").open() as f:
+            with (custom_handler_path := base / "handler.py").open():
                 # We can't import since it's not a valid python directory layout, nor do
                 # want to pollute the namespace.
                 module = importlib.machinery.SourceFileLoader(