Skip to content

Commit 772344b

Browse files
committed
Small create_repository.py format updates, fixes
Added missing traliling comma in `COORDINATE_GROUPS[0]`. Updated `get_label` to check for groups starting with `org.scala-lang.` Sorted `deps` in `to_rules_scala_compatible_dict` and always sets `deps` in the return value, even when empty.
1 parent 91d549a commit 772344b

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

scripts/create_repository.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,15 @@ def get_json_dependencies(artifact) -> List[MavenCoordinates]:
106106
data = json.load(file)
107107

108108
return (
109-
get_mavens_coordinates_from_json(dependency["directDependencies"])
110-
if any((dependency := d)["coord"] == artifact
111-
for d in data["dependencies"])
109+
get_mavens_coordinates_from_json(dep["directDependencies"])
110+
if any((dep := d)["coord"] == artifact for d in data["dependencies"])
112111
else []
113112
)
114113

115114
COORDINATE_GROUPS = [
116115
set([
117116
"com.twitter",
118-
"javax.annotation"
117+
"javax.annotation",
119118
"org.scala-lang",
120119
"org.scalactic",
121120
"org.scalatest",
@@ -147,7 +146,7 @@ def get_label(coordinates) -> str:
147146
group_label = group.replace('.', '_').replace('-', '_')
148147
artifact_label = coordinates.artifact.split('_')[0].replace('-', '_')
149148

150-
if group in COORDINATE_GROUPS[0]:
149+
if group in COORDINATE_GROUPS[0] or group.startswith("org.scala-lang."):
151150
return f'io_bazel_rules_scala_{artifact_label}'
152151
if group in COORDINATE_GROUPS[1]:
153152
return f'io_bazel_rules_scala_{group_label}_{artifact_label}'
@@ -205,18 +204,17 @@ def to_rules_scala_compatible_dict(artifacts) -> Dict[str, Dict]:
205204
.replace('scala3_', 'scala_')
206205
.replace('scala_tasty_core', 'scala_scala_tasty_core')
207206
)
208-
deps = [
207+
deps = sorted([
209208
f'@{get_label(dep)}_2'
210209
if "scala3-library_3" in a.coordinates.artifact
211210
else f'@{get_label(dep)}'
212211
for dep in a.direct_dependencies
213-
]
214-
result[label] = metadata = {
212+
])
213+
result[label] = {
215214
"artifact": f"{a.coordinates.coordinate}",
216215
"sha256": f"{a.checksum}",
216+
"deps": deps,
217217
}
218-
if deps:
219-
metadata["deps"] = deps
220218

221219
return result
222220

@@ -275,7 +273,7 @@ def create_file(version):
275273
metadata["artifact"] = artifact
276274
metadata["sha256"] = generated_metadata["sha256"]
277275
dependencies = [
278-
d for d in generated_metadata.get("deps:", []) if (
276+
d for d in generated_metadata["deps"] if (
279277
d[1:] in original_artifacts and
280278
"runtime" not in d and
281279
"runtime" not in artifact

0 commit comments

Comments
 (0)