use ruff as formatter

Signed-off-by: Arthur Zamarin <[email protected]>

Author: arthurzam

.github/workflows/test.yml

@@ -89,4 +89,6 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    - uses: psf/black@stable
+    - uses: astral-sh/ruff-action@v3
+      with:
+        args: "format --check --diff"

Makefile

@@ -15,4 +15,4 @@ clean:
 
 .PHONY: format
 format:
-	$(PYTHON) -m black .
+	$(PYTHON) -m ruff format

pyproject.toml

@@ -68,6 +68,10 @@ exclude = [
 	"doc/api/", "doc/generated/", "doc/_build/",
 ]
 
+[tool.ruff]
+line-length = 100
+target-version = "py311"
+
 [tool.black]
 line-length = 100
 

src/pkgdev/mangle.py

@@ -82,7 +82,7 @@ def keywords_sort_key(kw):
                 new_kw = " ".join(kw)
                 if not mo.group("quote"):
                     new_kw = f'"{new_kw}"'
-                lines[i] = f'{mo.group("pre")}{new_kw}{mo.group("post")}'
+                lines[i] = f"{mo.group('pre')}{new_kw}{mo.group('post')}"
                 break
         return change.update("\n".join(lines) + "\n")
 

src/pkgdev/scripts/pkgdev_bugs.py

@@ -497,9 +497,9 @@ def build_full_graph(self):
             if pkg_has_stable and not keywords:  # package already done
                 self.out.write(f"Nothing to stable for {pkg.unversioned_atom}")
                 continue
-            assert (
-                keywords
-            ), f"no keywords for {pkg.versioned_atom}, currently unsupported by tool: https://github.com/pkgcore/pkgdev/issues/123"
+            assert keywords, (
+                f"no keywords for {pkg.versioned_atom}, currently unsupported by tool: https://github.com/pkgcore/pkgdev/issues/123"
+            )
             self.nodes.add(new_node := GraphNode(((pkg, keywords),)))
             vertices[pkg] = new_node
             if reason:

src/pkgdev/scripts/pkgdev_showkw.py

@@ -33,7 +33,7 @@
         Output table using specified tabular format (defaults to compressed,
         custom format).
 
-        Available formats: {', '.join(tabulate_formats)}
+        Available formats: {", ".join(tabulate_formats)}
     """,
 )
 output_opts.add_argument(

src/pkgdev/scripts/pkgdev_tatt.py

@@ -309,8 +309,10 @@ def _build_job(namespace, pkg, is_test: bool):
     )
     for solution in solutions:
         use_flags, use_expand = _groupby_use_expand(solution, use_expand_prefixes, enabled, iuse)
-        yield " ".join(use_flags) + " " + " ".join(
-            f'{var.upper()}: {" ".join(vals)}' for var, vals in use_expand.items()
+        yield (
+            " ".join(use_flags)
+            + " "
+            + " ".join(f"{var.upper()}: {' '.join(vals)}" for var, vals in use_expand.items())
         )
 
 
@@ -335,7 +337,7 @@ def _create_config_files(pkgs, job_name, is_keywording):
     with (res := portage_accept_keywords / f"pkgdev_tatt_{job_name}.keywords").open("w") as f:
         f.write(f"# Job created by pkgdev tatt for {job_name!r}\n")
         for pkg in pkgs:
-            f.write(f'{pkg.versioned_atom} {"**" if is_keywording else ""}\n')
+            f.write(f"{pkg.versioned_atom} {'**' if is_keywording else ''}\n")
     yield str(res)
 
     _create_config_dir(portage_env)

tests/scripts/test_pkgdev_bugs.py

@@ -26,7 +26,7 @@ def mk_pkg(repo, cpvstr, maintainers, **kwargs):
                     <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
                     <pkgmetadata>
                         <maintainer type="person">
-                            {' '.join(f'<email>{maintainer}@gentoo.org</email>' for maintainer in maintainers)}
+                            {" ".join(f"<email>{maintainer}@gentoo.org</email>" for maintainer in maintainers)}
                         </maintainer>
                     </pkgmetadata>
                 """