diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2025-09-01 17:36:54 +0400 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2025-09-03 16:12:53 +0400 |
commit | dd535cef8df839942a5781c79bbf299839fdd0b3 (patch) | |
tree | 1bbc5bafa34d7502d264bad96c02c4895a0415e1 /containers | |
parent | 8c18322f3b7a6fd6f93cc2370dd23fa11b7c89e3 (diff) | |
download | libvirt-ci-dd535cef8df839942a5781c79bbf299839fdd0b3.zip libvirt-ci-dd535cef8df839942a5781c79bbf299839fdd0b3.tar.gz libvirt-ci-dd535cef8df839942a5781c79bbf299839fdd0b3.tar.bz2 |
Run black
It's a bit massive diff, but why isn't the project enforcing formatting?
It makes working with editors and tools much easier then.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to 'containers')
-rwxr-xr-x | containers/check-dco/check-dco.py | 45 | ||||
-rwxr-xr-x | containers/cirrus-run/cirrus-vars.py | 6 |
2 files changed, 31 insertions, 20 deletions
diff --git a/containers/check-dco/check-dco.py b/containers/check-dco/check-dco.py index 402b8e0..85f274e 100755 --- a/containers/check-dco/check-dco.py +++ b/containers/check-dco/check-dco.py @@ -17,8 +17,9 @@ if len(sys.argv) >= 2: def get_default_branch(remote): - info = subprocess.check_output(["git", "remote", "show", remote], - universal_newlines=True) + info = subprocess.check_output( + ["git", "remote", "show", remote], universal_newlines=True + ) head = "HEAD branch: " for line in info.split("\n"): offset = line.find(head) @@ -37,12 +38,15 @@ def get_branch_commits(): subprocess.check_call(["git", "remote", "add", "check-dco", repourl]) try: main = get_default_branch("check-dco") - subprocess.check_call(["git", "fetch", "check-dco", main], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL) - - ancestor = subprocess.check_output(["git", "merge-base", "check-dco/" + main, "HEAD"], - universal_newlines=True) + subprocess.check_call( + ["git", "fetch", "check-dco", main], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + + ancestor = subprocess.check_output( + ["git", "merge-base", "check-dco/" + main, "HEAD"], universal_newlines=True + ) ancestor = ancestor.strip() return (ancestor, "HEAD") @@ -51,8 +55,10 @@ def get_branch_commits(): def get_mergereq_commits(): - return (os.environ["CI_MERGE_REQUEST_DIFF_BASE_SHA"], - os.environ["CI_MERGE_REQUEST_SOURCE_BRANCH_SHA"]) + return ( + os.environ["CI_MERGE_REQUEST_DIFF_BASE_SHA"], + os.environ["CI_MERGE_REQUEST_SOURCE_BRANCH_SHA"], + ) if os.environ.get("CI_PIPELINE_SOURCE", "") == "merge_request_event": @@ -62,10 +68,14 @@ else: errors = False -print("\nChecking for 'Signed-off-by: NAME <EMAIL>' on all commits since %s...\n" % ancestor) +print( + "\nChecking for 'Signed-off-by: NAME <EMAIL>' on all commits since %s...\n" + % ancestor +) -log = subprocess.check_output(["git", "log", "--format=%H %s", ancestor + "..." + head], - universal_newlines=True) +log = subprocess.check_output( + ["git", "log", "--format=%H %s", ancestor + "..." + head], universal_newlines=True +) if log == "": commits = [] @@ -74,8 +84,7 @@ else: for sha, subject in commits: - msg = subprocess.check_output(["git", "show", "-s", sha], - universal_newlines=True) + msg = subprocess.check_output(["git", "show", "-s", sha], universal_newlines=True) lines = msg.strip().split("\n") print("🔍 %s %s" % (sha, subject)) @@ -92,7 +101,8 @@ for sha, subject in commits: errors = True if errors: - print(""" + print( + """ ❌ ERROR: One or more commits are missing a valid Signed-off-By tag. @@ -113,7 +123,8 @@ To bulk update all commits on current branch "git rebase" can be used: git rebase -i master -x 'git commit --amend --no-edit -s' -""") +""" + ) sys.exit(1) diff --git a/containers/cirrus-run/cirrus-vars.py b/containers/cirrus-run/cirrus-vars.py index 3d863e7..48570bf 100755 --- a/containers/cirrus-run/cirrus-vars.py +++ b/containers/cirrus-run/cirrus-vars.py @@ -4,16 +4,16 @@ import os import re import sys -var = re.compile(r'@([a-zA-Z0-9_]+)@') +var = re.compile(r"@([a-zA-Z0-9_]+)@") # Return empty string if var is not set, since not all # OS targets require all vars to be set. def get_env(matchobj): - return os.environ.get(matchobj.group(1), '') + return os.environ.get(matchobj.group(1), "") for line in sys.stdin: - print(var.sub(get_env, line), end='') + print(var.sub(get_env, line), end="") sys.exit(0) |