commit: 14ba154481889081b5d9cf0db69142d2e6ec703e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 14 09:03:52 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 14 09:03:52 2025 +0000
URL:
https://gitweb.gentoo.org/proj/pkgcore/pkgdev.git/commit/?id=14ba1544
use ruff as formatter
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
.github/workflows/test.yml | 4 +++-
Makefile | 2 +-
pyproject.toml | 4 ++++
src/pkgdev/mangle.py | 2 +-
src/pkgdev/scripts/pkgdev_bugs.py | 6 +++---
src/pkgdev/scripts/pkgdev_showkw.py | 2 +-
src/pkgdev/scripts/pkgdev_tatt.py | 8 +++++---
tests/scripts/test_pkgdev_bugs.py | 2 +-
8 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7565226..04f5a75 100644
--- a/.github/workflows/test.yml
+++ b/.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"
diff --git a/Makefile b/Makefile
index 516751d..24cdb66 100644
--- a/Makefile
+++ b/Makefile
@@ -15,4 +15,4 @@ clean:
.PHONY: format
format:
- $(PYTHON) -m black .
+ $(PYTHON) -m ruff format
diff --git a/pyproject.toml b/pyproject.toml
index 40698c7..8c61da1 100644
--- a/pyproject.toml
+++ b/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
diff --git a/src/pkgdev/mangle.py b/src/pkgdev/mangle.py
index 29b0f91..e818965 100644
--- a/src/pkgdev/mangle.py
+++ b/src/pkgdev/mangle.py
@@ -82,7 +82,7 @@ class Mangler:
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")
diff --git a/src/pkgdev/scripts/pkgdev_bugs.py
b/src/pkgdev/scripts/pkgdev_bugs.py
index e805594..6d9a2a2 100644
--- a/src/pkgdev/scripts/pkgdev_bugs.py
+++ b/src/pkgdev/scripts/pkgdev_bugs.py
@@ -497,9 +497,9 @@ class DependencyGraph:
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:
diff --git a/src/pkgdev/scripts/pkgdev_showkw.py
b/src/pkgdev/scripts/pkgdev_showkw.py
index 86f6e78..6208c10 100644
--- a/src/pkgdev/scripts/pkgdev_showkw.py
+++ b/src/pkgdev/scripts/pkgdev_showkw.py
@@ -33,7 +33,7 @@ output_opts.add_argument(
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(
diff --git a/src/pkgdev/scripts/pkgdev_tatt.py
b/src/pkgdev/scripts/pkgdev_tatt.py
index 75e50cf..0978931 100644
--- a/src/pkgdev/scripts/pkgdev_tatt.py
+++ b/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)
diff --git a/tests/scripts/test_pkgdev_bugs.py
b/tests/scripts/test_pkgdev_bugs.py
index 3a61a89..a937229 100644
--- a/tests/scripts/test_pkgdev_bugs.py
+++ b/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>
"""
