Skip to content

test: Add _test_simple_multiple_platforms_with_extras #3193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+114 −13
Open

test: Add _test_simple_multiple_platforms_with_extras #3193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d018b7
Add `_test_multiple_extras_multiple_requirements`
hartikainen Aug 3, 2025
b4dc3af
Make `target_platforms` an explicit list argument
hartikainen Oct 21, 2025
da78467
Enable `extras` in `{whl,pypi}_repo_name`
hartikainen Oct 21, 2025
018f135
Include `extras` in whl names in hub builder tests
hartikainen Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions python/private/pypi/hub_builder.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,9 @@ def _whl_repo(
target_platforms = src.target_platforms if is_multiple_versions else []
return struct(
repo_name = pypi_repo_name(
normalize_name(src.distribution),
*target_platforms
whl_name = normalize_name(src.distribution),
target_platforms = target_platforms,
extras = src.extras,
),
args = args,
config_setting = whl_config_setting(
Expand Down Expand Up @@ -567,7 +568,7 @@ def _whl_repo(
]

return struct(
repo_name = whl_repo_name(src.filename, src.sha256),
repo_name = whl_repo_name(src.filename, src.sha256, extras = src.extras),
args = args,
config_setting = whl_config_setting(
version = python_version,
Expand Down
1 change: 1 addition & 0 deletions python/private/pypi/parse_requirements.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ def _package_srcs(
sha256 = dist.sha256,
url = dist.url,
yanked = dist.yanked,
extras = requirement(r.requirement_line).extras,
),
)

Expand Down
10 changes: 8 additions & 2 deletions python/private/pypi/whl_repo_name.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
load("//python/private:normalize_name.bzl", "normalize_name")
load(":parse_whl_name.bzl", "parse_whl_name")

def whl_repo_name(filename, sha256):
def whl_repo_name(filename, sha256, extras = []):
"""Return a valid whl_library repo name given a distribution filename.

Args:
Expand Down Expand Up @@ -59,9 +59,12 @@ def whl_repo_name(filename, sha256):
elif version:
parts.insert(1, version)

if extras:
parts.extend(sorted([e for e in extras if e]))

return "_".join(parts)

def pypi_repo_name(whl_name, *target_platforms):
def pypi_repo_name(whl_name, target_platforms = [], extras = []):
"""Return a valid whl_library given a requirement line.

Args:
Expand All @@ -76,4 +79,7 @@ def pypi_repo_name(whl_name, *target_platforms):
]
parts.extend([p.partition("_")[-1] for p in target_platforms])

if extras:
parts.extend(sorted([e for e in extras if e]))

return "_".join(parts)
109 changes: 101 additions & 8 deletions tests/pypi/hub_builder/hub_builder_tests.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ optimum[onnxruntime-gpu]==1.17.1 ; sys_platform == 'linux'
pypi.group_map().contains_exactly({})
pypi.whl_map().contains_exactly({
"optimum": {
"pypi_315_optimum_linux_aarch64_linux_x86_64_linux_x86_64_freethreaded": [
"pypi_315_optimum_linux_aarch64_linux_x86_64_linux_x86_64_freethreaded_onnxruntime-gpu": [
whl_config_setting(
version = "3.15",
target_platforms = [
Expand All @@ -953,7 +953,7 @@ optimum[onnxruntime-gpu]==1.17.1 ; sys_platform == 'linux'
],
),
],
"pypi_315_optimum_osx_aarch64": [
"pypi_315_optimum_osx_aarch64_onnxruntime": [
whl_config_setting(
version = "3.15",
target_platforms = [
Expand All @@ -964,13 +964,13 @@ optimum[onnxruntime-gpu]==1.17.1 ; sys_platform == 'linux'
},
})
pypi.whl_libraries().contains_exactly({
"pypi_315_optimum_linux_aarch64_linux_x86_64_linux_x86_64_freethreaded": {
"pypi_315_optimum_linux_aarch64_linux_x86_64_linux_x86_64_freethreaded_onnxruntime-gpu": {
"config_load": "@pypi//:config.bzl",
"dep_template": "@pypi//{name}:{target}",
"python_interpreter_target": "unit_test_interpreter_target",
"requirement": "optimum[onnxruntime-gpu]==1.17.1",
},
"pypi_315_optimum_osx_aarch64": {
"pypi_315_optimum_osx_aarch64_onnxruntime": {
"config_load": "@pypi//:config.bzl",
"dep_template": "@pypi//{name}:{target}",
"python_interpreter_target": "unit_test_interpreter_target",
Expand Down Expand Up @@ -1028,15 +1028,15 @@ optimum[onnxruntime-gpu]==1.17.1 ; sys_platform == 'linux'
pypi.group_map().contains_exactly({})
pypi.whl_map().contains_exactly({
"optimum": {
"pypi_315_optimum_mylinuxx86_64": [
"pypi_315_optimum_mylinuxx86_64_onnxruntime-gpu": [
whl_config_setting(
version = "3.15",
target_platforms = [
"cp315_mylinuxx86_64",
],
),
],
"pypi_315_optimum_myosxaarch64": [
"pypi_315_optimum_myosxaarch64_onnxruntime": [
whl_config_setting(
version = "3.15",
target_platforms = [
Expand All @@ -1047,13 +1047,13 @@ optimum[onnxruntime-gpu]==1.17.1 ; sys_platform == 'linux'
},
})
pypi.whl_libraries().contains_exactly({
"pypi_315_optimum_mylinuxx86_64": {
"pypi_315_optimum_mylinuxx86_64_onnxruntime-gpu": {
"config_load": "@pypi//:config.bzl",
"dep_template": "@pypi//{name}:{target}",
"python_interpreter_target": "unit_test_interpreter_target",
"requirement": "optimum[onnxruntime-gpu]==1.17.1",
},
"pypi_315_optimum_myosxaarch64": {
"pypi_315_optimum_myosxaarch64_onnxruntime": {
"config_load": "@pypi//:config.bzl",
"dep_template": "@pypi//{name}:{target}",
"python_interpreter_target": "unit_test_interpreter_target",
Expand All @@ -1064,6 +1064,99 @@ optimum[onnxruntime-gpu]==1.17.1 ; sys_platform == 'linux'

_tests.append(_test_pipstar_platforms)

def _test_multiple_extras_multiple_requirements(env):
"""Test that reproduces an issue where multiple extras point to same whl.

Based on https://github.com/bazel-contrib/rules_python/issues/2797#issuecomment-3143914644.
"""

def mock_simpleapi_download(*_, **__):
return {
"package": parse_simpleapi_html(
url = "https://example.com/package",
content = '''
<a href="package-0.7.0.tar.gz#sha256=4dd8924f171ed73a4f1a6191e2f800ae1745069989b69fabc45593d6b6504003">package-0.7.0.tar.gz</a>
<a href="package-0.7.0-py3-none-any.whl#sha256=62833036cbaf4641d66ae94c61c0446890a91b2c0d153946583a0ebe04877a76">package-0.7.0-py3-none-any.whl</a>
''',
),
}

builder = hub_builder(
env,
available_interpreters = {
"python_3_12_host": "unit_test_interpreter_target",
},
minor_mapping = {"3.12": "3.12.11"},
simpleapi_download_fn = mock_simpleapi_download,
)
builder.pip_parse(
_mock_mctx(
read = lambda x: {
"requirements.linux_arm64.txt": """
package==0.7.0 --hash=sha256:4dd8924f171ed73a4f1a6191e2f800ae1745069989b69fabc45593d6b6504003
--hash=sha256:62833036cbaf4641d66ae94c61c0446890a91b2c0d153946583a0ebe04877a76
""",
"requirements.linux_x86_64.txt": """
package[extra]==0.7.0 --hash=sha256:62833036cbaf4641d66ae94c61c0446890a91b2c0d153946583a0ebe04877a76
""",
}[x],
),
_parse(
hub_name = "pypi",
python_version = "3.12",
download_only = True,
requirements_by_platform = {
"requirements.linux_arm64.txt": "linux_aarch64",
"requirements.linux_x86_64.txt": "linux_x86_64",
},
experimental_index_url = "pypi.org",
),
)
pypi = builder.build()

pypi.exposed_packages().contains_exactly(["package"])
pypi.group_map().contains_exactly({})

pypi.whl_map().contains_exactly({
"package": {
"pypi_312_package_py3_none_any_62833036": [
whl_config_setting(
target_platforms = ["cp312_linux_aarch64"],
version = "3.12",
),
],
"pypi_312_package_py3_none_any_62833036_extra": [
whl_config_setting(
target_platforms = ["cp312_linux_x86_64"],
version = "3.12",
),
],
},
})
pypi.whl_libraries().contains_exactly({
"pypi_312_package_py3_none_any_62833036": {
"config_load": "@pypi//:config.bzl",
"dep_template": "@pypi//{name}:{target}",
"filename": "package-0.7.0-py3-none-any.whl",
"python_interpreter_target": "unit_test_interpreter_target",
"requirement": "package==0.7.0",
"sha256": "62833036cbaf4641d66ae94c61c0446890a91b2c0d153946583a0ebe04877a76",
"urls": ["https://example.com/package/package-0.7.0-py3-none-any.whl"],
},
"pypi_312_package_py3_none_any_62833036_extra": {
"config_load": "@pypi//:config.bzl",
"dep_template": "@pypi//{name}:{target}",
"filename": "package-0.7.0-py3-none-any.whl",
"python_interpreter_target": "unit_test_interpreter_target",
"requirement": "package[extra]==0.7.0",
"sha256": "62833036cbaf4641d66ae94c61c0446890a91b2c0d153946583a0ebe04877a76",
"urls": ["https://example.com/package/package-0.7.0-py3-none-any.whl"],
},
})
pypi.extra_aliases().contains_exactly({})

_tests.append(_test_multiple_extras_multiple_requirements)

def hub_builder_test_suite(name):
"""Create the test suite.

Expand Down