Include extras in whl names in hub builder tests

Author: hartikainen

tests/pypi/hub_builder/hub_builder_tests.bzl

@@ -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 = [
@@ -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 = [
@@ -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",
@@ -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 = [
@@ -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",
@@ -1121,25 +1121,33 @@ package[extra]==0.7.0 --hash=sha256:62833036cbaf4641d66ae94c61c0446890a91b2c0d15
         "package": {
             "pypi_312_package_py3_none_any_62833036": [
                 whl_config_setting(
-                    # TODO(hartikainen): The two platforms both use the same `.whl` and
-                    # are thus included in the same `target_platforms` here.
-                    target_platforms = ["cp312_linux_aarch64", "cp312_linux_x86_64"],
+                    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({
-        # NOTE(hartikainen): The error stems here. We have two different platforms
-        # pointing to the same universal wheel, both just with different extras. The key
-        # clashes and probably needs the extras to be included in it.
         "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",
-            # NOTE(hartikainen):  This should say `package[extra]==0.7.0` for
-            # `linux_x86_64` platform and `package==0.7.0` for `linux_aarch64`
+            "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"],