Skip to content

Commit c75039d

Browse files
committed
fix: make the names of the repos more user friendly
1 parent 0400154 commit c75039d

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

examples/bzlmod/MODULE.bazel.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

python/private/pypi/extension.bzl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ def _create_whl_repos(
318318
exposed_packages[whl_name] = None
319319
continue
320320

321-
for i, requirement in enumerate(requirements):
321+
for requirement in requirements:
322322
is_exposed = is_exposed or requirement.is_exposed
323323
if get_index_urls:
324324
logger.warn(lambda: "falling back to pip for installing the right file for {}".format(requirement.requirement_line))
@@ -329,7 +329,10 @@ def _create_whl_repos(
329329

330330
repo_name = "{}_{}".format(pip_name, whl_name)
331331
if len(requirements) > 1:
332-
repo_name = "{}__{}".format(repo_name, i)
332+
repo_name = "{}__{}".format(repo_name, "_".join(sorted([
333+
p.partition("_")[-1]
334+
for p in requirement.target_platforms
335+
])))
333336

334337
whl_libraries[repo_name] = dict(whl_library_args.items())
335338
whl_map.setdefault(whl_name, []).append(

tests/pypi/extension/extension_tests.bzl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ def _test_simple_multiple_requirements(env):
208208
struct(
209209
config_setting = "//_config:is_python_3.15",
210210
filename = None,
211-
repo = "pypi_315_simple__0",
211+
repo = "pypi_315_simple__windows_x86_64",
212212
target_platforms = [
213213
"cp315_windows_x86_64",
214214
],
@@ -217,7 +217,7 @@ def _test_simple_multiple_requirements(env):
217217
struct(
218218
config_setting = "//_config:is_python_3.15",
219219
filename = None,
220-
repo = "pypi_315_simple__1",
220+
repo = "pypi_315_simple__osx_aarch64_osx_x86_64",
221221
target_platforms = [
222222
"cp315_osx_aarch64",
223223
"cp315_osx_x86_64",
@@ -227,17 +227,17 @@ def _test_simple_multiple_requirements(env):
227227
],
228228
}})
229229
pypi.whl_libraries().contains_exactly({
230-
"pypi_315_simple__0": {
230+
"pypi_315_simple__osx_aarch64_osx_x86_64": {
231231
"dep_template": "@pypi//{name}:{target}",
232232
"python_interpreter_target": "unit_test_interpreter_target",
233233
"repo": "pypi_315",
234-
"requirement": "simple==0.0.1 --hash=sha256:deadbeef",
234+
"requirement": "simple==0.0.2 --hash=sha256:deadb00f",
235235
},
236-
"pypi_315_simple__1": {
236+
"pypi_315_simple__windows_x86_64": {
237237
"dep_template": "@pypi//{name}:{target}",
238238
"python_interpreter_target": "unit_test_interpreter_target",
239239
"repo": "pypi_315",
240-
"requirement": "simple==0.0.2 --hash=sha256:deadb00f",
240+
"requirement": "simple==0.0.1 --hash=sha256:deadbeef",
241241
},
242242
})
243243
pypi.whl_mods().contains_exactly({})
@@ -304,14 +304,14 @@ simple==0.0.3 --hash=sha256:deadbaaf
304304
struct(
305305
config_setting = "//_config:is_python_3.15",
306306
filename = None,
307-
repo = "pypi_315_simple__0",
307+
repo = "pypi_315_simple__linux_x86_64",
308308
target_platforms = ["cp315_linux_x86_64"],
309309
version = "3.15",
310310
),
311311
struct(
312312
config_setting = "//_config:is_python_3.15",
313313
filename = None,
314-
repo = "pypi_315_simple__1",
314+
repo = "pypi_315_simple__osx_aarch64",
315315
target_platforms = ["cp315_osx_aarch64"],
316316
version = "3.15",
317317
),
@@ -326,15 +326,15 @@ simple==0.0.3 --hash=sha256:deadbaaf
326326
"repo": "pypi_315",
327327
"requirement": "extra==0.0.1 --hash=sha256:deadb00f",
328328
},
329-
"pypi_315_simple__0": {
329+
"pypi_315_simple__linux_x86_64": {
330330
"dep_template": "@pypi//{name}:{target}",
331331
"download_only": True,
332332
"extra_pip_args": ["--platform=manylinux_2_17_x86_64", "--python-version=315", "--implementation=cp", "--abi=cp315"],
333333
"python_interpreter_target": "unit_test_interpreter_target",
334334
"repo": "pypi_315",
335335
"requirement": "simple==0.0.1 --hash=sha256:deadbeef",
336336
},
337-
"pypi_315_simple__1": {
337+
"pypi_315_simple__osx_aarch64": {
338338
"dep_template": "@pypi//{name}:{target}",
339339
"download_only": True,
340340
"extra_pip_args": ["--platform=macosx_10_9_arm64", "--python-version=315", "--implementation=cp", "--abi=cp315"],

0 commit comments

Comments
 (0)