Skip to content

Commit

Permalink
tree-wide: Fix python formatting
Browse files Browse the repository at this point in the history
The new release of ruff formats a few more things which causes linter
failures in CI so let's fix those formatting nits.

(cherry picked from commit 96403d5121d93dd47dbe9dab5b90ff973e664ac3)

Related: RHEL-57603
  • Loading branch information
DaanDeMeyer authored and github-actions[bot] committed Jan 15, 2025
1 parent 2c7a7aa commit 879603e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/ukify/ukify.py
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ def call_systemd_measure(uki: UKI, opts: UkifyConfig, profile_start: int = 0) ->
cmd = [
measure_tool,
'calculate',
*(f"--{s.name.removeprefix('.')}={s.content}" for s in to_measure.values()),
*(f'--{s.name.removeprefix(".")}={s.content}' for s in to_measure.values()),
*(f'--bank={bank}' for bank in banks),
# For measurement, the keys are not relevant, so we can lump all the phase paths
# into one call to systemd-measure calculate.
Expand All @@ -786,7 +786,7 @@ def call_systemd_measure(uki: UKI, opts: UkifyConfig, profile_start: int = 0) ->
cmd = [
measure_tool,
'sign',
*(f"--{s.name.removeprefix('.')}={s.content}" for s in to_measure.values()),
*(f'--{s.name.removeprefix(".")}={s.content}' for s in to_measure.values()),
*(f'--bank={bank}' for bank in banks),
]

Expand Down Expand Up @@ -1284,7 +1284,7 @@ def make_uki(opts: UkifyConfig) -> None:
os.umask(umask := os.umask(0))
os.chmod(opts.output, 0o777 & ~umask)

print(f"Wrote {'signed' if sign_args_present else 'unsigned'} {opts.output}")
print(f'Wrote {"signed" if sign_args_present else "unsigned"} {opts.output}')


@contextlib.contextmanager
Expand Down
6 changes: 3 additions & 3 deletions test/integration-test-wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,15 +429,15 @@ def main() -> None:
dropin += textwrap.dedent(
f"""
[Service]
Environment=TEST_MATCH_SUBTEST={os.environ["TEST_MATCH_SUBTEST"]}
Environment=TEST_MATCH_SUBTEST={os.environ['TEST_MATCH_SUBTEST']}
"""
)

if os.getenv('TEST_MATCH_TESTCASE'):
dropin += textwrap.dedent(
f"""
[Service]
Environment=TEST_MATCH_TESTCASE={os.environ["TEST_MATCH_TESTCASE"]}
Environment=TEST_MATCH_TESTCASE={os.environ['TEST_MATCH_TESTCASE']}
"""
)

Expand Down Expand Up @@ -559,7 +559,7 @@ def main() -> None:

ops += [f'journalctl --file {journal_file} --no-hostname -o short-monotonic -u {args.unit} -p info']

print("Test failed, relevant logs can be viewed with: \n\n" f"{(' && '.join(ops))}\n", file=sys.stderr)
print(f'Test failed, relevant logs can be viewed with: \n\n{(" && ".join(ops))}\n', file=sys.stderr)

# 0 also means we failed so translate that to a non-zero exit code to mark the test as failed.
exit(result.returncode or 1)
Expand Down

0 comments on commit 879603e

Please sign in to comment.