From 5748235da16e1f0fe759430ebb2b814b68902833 Mon Sep 17 00:00:00 2001
From: Stefan Hansson <newbyte@postmarketos.org>
Date: Mon, 3 Feb 2025 11:23:19 +0100
Subject: [PATCH] mrhlpr, mrtest: Reformat with Ruff 0.9
---
mrhlpr/frontend.py | 9 ++++-----
mrhlpr/mr.py | 4 ++--
mrhlpr/pipeline.py | 2 +-
mrtest/frontend.py | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/mrhlpr/frontend.py b/mrhlpr/frontend.py
index d6757a8..76d4900 100644
--- a/mrhlpr/frontend.py
+++ b/mrhlpr/frontend.py
@@ -187,12 +187,11 @@ def print_status(mr_id: int, no_cache: bool = False) -> None:
if len(commits) > 1:
print_error(
- f"* {len(commits)} commits: consider squashing"
- f" ('git rebase -i origin/{target_branch}')"
+ f"* {len(commits)} commits: consider squashing ('git rebase -i origin/{target_branch}')"
)
if not is_rebased:
- print_error(f"* Rebase on {target_branch} ('git" f" rebase origin/{target_branch}')")
+ print_error(f"* Rebase on {target_branch} ('git rebase origin/{target_branch}')")
print_error("* Check again ('mrhlpr status')")
return
@@ -220,7 +219,7 @@ def get_parser() -> argparse.ArgumentParser:
"-v",
"--verbose",
action="store_true",
- help="display debug log: all git commands and" " locations of http cache files",
+ help="display debug log: all git commands and locations of http cache files",
)
parser.add_argument(
"-V", "--version", action="version", version=version.get_full_version_information()
@@ -239,7 +238,7 @@ def get_parser() -> argparse.ArgumentParser:
"--no-fetch",
action="store_false",
dest="fetch",
- help="do not fetch the remote and origin" " repositories",
+ help="do not fetch the remote and origin repositories",
)
checkout.add_argument(
"-o",
diff --git a/mrhlpr/mr.py b/mrhlpr/mr.py
index fbd07e2..da1de03 100644
--- a/mrhlpr/mr.py
+++ b/mrhlpr/mr.py
@@ -226,7 +226,7 @@ def checkout(
git.run(["remote", "set-url", remote_local, url])
git.run(["remote", "set-url", "--push", remote_local, url_push])
else:
- print("ERROR: Remote '" + remote_local + "' already exists and has" " a different URL.")
+ print("ERROR: Remote '" + remote_local + "' already exists and has a different URL.")
print()
print("existing: " + existing)
print("expected: " + url)
@@ -275,7 +275,7 @@ def checkout(
# Check existing branch
remote_existing = git.branch_remote(branch_local)
if remote_existing != remote_local:
- print("Branch '" + branch_local + "' exists, but points to a" " different remote.")
+ print("Branch '" + branch_local + "' exists, but points to a different remote.")
print()
print("existing remote: " + str(remote_existing))
print("expected remote: " + remote_local)
diff --git a/mrhlpr/pipeline.py b/mrhlpr/pipeline.py
index f497203..e018624 100644
--- a/mrhlpr/pipeline.py
+++ b/mrhlpr/pipeline.py
@@ -51,7 +51,7 @@ class PipelineMetadata:
job = self._get_build_job(api_pipeline_jobs)
if not job:
logging.error(
- "ERROR: could not find build job with device's architecture in the" " pipeline."
+ "ERROR: could not find build job with device's architecture in the pipeline."
)
exit(1)
diff --git a/mrtest/frontend.py b/mrtest/frontend.py
index d8f98c9..fabfd0a 100644
--- a/mrtest/frontend.py
+++ b/mrtest/frontend.py
@@ -56,7 +56,7 @@ def get_parser() -> argparse.ArgumentParser:
"-v",
"--verbose",
action="store_true",
- help="display debug log: all commands and locations of" " http cache files",
+ help="display debug log: all commands and locations of http cache files",
)
parser.add_argument(
"-V", "--version", action="version", version=mrhlpr.version.get_full_version_information()
--
GitLab