Skip to content

Commit 2c94a9e

Browse files
committed
format
1 parent 79b6ece commit 2c94a9e

File tree

2 files changed

+24
-19
lines changed

2 files changed

+24
-19
lines changed

hermetic_build/library_generation/owlbot/src/fix_poms.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,9 @@ def main(versions_file, monorepo):
359359
repo_metadata = json.load(fp)
360360
group_id, artifact_id = repo_metadata["distribution_name"].split(":")
361361
# Derive the Release Please key in java-xxx format
362-
base_name = re.sub(r'^(google-cloud-|grpc-google-cloud-|proto-google-cloud-)', '', artifact_id)
362+
base_name = re.sub(
363+
r"^(google-cloud-|grpc-google-cloud-|proto-google-cloud-)", "", artifact_id
364+
)
363365
release_please_key = f"java-{base_name}"
364366
name = repo_metadata["name_pretty"]
365367
existing_modules = load_versions(versions_file, group_id)
@@ -597,7 +599,6 @@ def main(versions_file, monorepo):
597599
print(f"updating modules in {versions_file}")
598600
existing_modules.pop(parent_artifact_id)
599601

600-
601602
# Consolidate all modules into a single `java-` entry.
602603
# It's safe to use the first module's version and group ID,
603604
# as they will be consistent for a new library.
@@ -608,10 +609,11 @@ def main(versions_file, monorepo):
608609
# Only write the main artifact module to versions.txt
609610
modules=[
610611
module.Module(
611-
group_id=main_module.group_id,
612-
artifact_id=release_please_key,
613-
version=main_module.version,
614-
release_version=main_module.release_version,)
612+
group_id=main_module.group_id,
613+
artifact_id=release_please_key,
614+
version=main_module.version,
615+
release_version=main_module.release_version,
616+
)
615617
],
616618
)
617619

hermetic_build/library_generation/tests/resources/goldens/owlbot-golden.py

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,19 @@
2121
s.move(library)
2222

2323
s.remove_staging_dirs()
24-
java.common_templates(monorepo=True, excludes=[
25-
".github/*",
26-
".kokoro/*",
27-
"samples/*",
28-
"CODE_OF_CONDUCT.md",
29-
"CONTRIBUTING.md",
30-
"LICENSE",
31-
"SECURITY.md",
32-
"java.header",
33-
"license-checks.xml",
34-
"renovate.json",
35-
".gitignore"
36-
])
24+
java.common_templates(
25+
monorepo=True,
26+
excludes=[
27+
".github/*",
28+
".kokoro/*",
29+
"samples/*",
30+
"CODE_OF_CONDUCT.md",
31+
"CONTRIBUTING.md",
32+
"LICENSE",
33+
"SECURITY.md",
34+
"java.header",
35+
"license-checks.xml",
36+
"renovate.json",
37+
".gitignore",
38+
],
39+
)

0 commit comments

Comments
 (0)