Fix multi-extra issue

Author: hartikainen

python/private/pypi/extension.bzl

@@ -420,6 +420,7 @@ def _whl_repo(
             return struct(
                 repo_name = pypi_repo_name(
                     normalize_name(src.distribution),
+                    src.extras,
                     *target_platforms
                 ),
                 args = args,
@@ -450,7 +451,7 @@ def _whl_repo(
         ]
 
     return struct(
-        repo_name = whl_repo_name(src.filename, src.sha256),
+        repo_name = whl_repo_name(src.filename, src.sha256, src.extras),
         args = args,
         config_setting = whl_config_setting(
             version = python_version,

python/private/pypi/parse_requirements.bzl

@@ -133,6 +133,7 @@ def parse_requirements(
         extra_pip_args = options[target_platform]
 
         for distribution, requirement_line in reqs_:
+            req = requirement(requirement_line)
             for_whl = requirements_by_platform.setdefault(
                 normalize_name(distribution),
                 {},
@@ -146,6 +147,7 @@ def parse_requirements(
                 struct(
                     distribution = distribution,
                     srcs = index_sources(requirement_line),
+                    extras = req.extras,
                     requirement_line = requirement_line,
                     target_platforms = [],
                     extra_pip_args = extra_pip_args,
@@ -269,6 +271,7 @@ def _package_srcs(
                     distribution = name,
                     extra_pip_args = r.extra_pip_args,
                     requirement_line = req_line,
+                    extras = r.extras,
                     target_platforms = [],
                     filename = dist.filename,
                     sha256 = dist.sha256,

python/private/pypi/whl_repo_name.bzl

@@ -35,7 +35,7 @@ def whl_repo_name(filename, sha256, extras):
         # Then the filename is basically foo-3.2.1.<ext>
         name, _, tail = filename.rpartition("-")
         parts.append(normalize_name(name))
-        parts.extend(sorted(extras))
+        parts.extend(sorted([e for e in extras if e]))
         if sha256:
             parts.append("sdist")
             version = ""
@@ -55,7 +55,7 @@ def whl_repo_name(filename, sha256, extras):
         parts.append(python_tag)
         parts.append(abi_tag)
         parts.append(platform_tag)
-        parts.extend(sorted(extras))
+        parts.extend(sorted([e for e in extras if e]))
 
     if sha256:
         parts.append(sha256[:8])
@@ -81,7 +81,7 @@ def pypi_repo_name(whl_name, extras, *target_platforms):
     parts = [
         normalize_name(whl_name),
     ]
-    parts.extend(sorted(extras))
+    parts.extend(sorted([e for e in extras if e]))
     parts.extend([p.partition("_")[-1] for p in target_platforms])
 
     return "_".join(parts)

tests/pypi/extension/extension_tests.bzl

@@ -463,10 +463,13 @@ package[extra]==0.7.0 \
         "package": {
             "pypi_312_package_py3_none_any_62833036": [
                 whl_config_setting(
-                    # TODO(hartikainen): I think all these platforms use the same `.whl`
-                    # and thus all three platforms should be 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_extra_62833036": [
+                whl_config_setting(
+                    target_platforms = ["cp312_linux_x86_64"],
                     version = "3.12",
                 ),
             ],
@@ -478,16 +481,21 @@ package[extra]==0.7.0 \
         # needs the extras to be included in it.
         "pypi_312_package_py3_none_any_62833036": {
             "dep_template": "@pypi//{name}:{target}",
-            "download_only": True,
-            "experimental_target_platforms": ["linux_aarch64", "linux_x86_64"],
+            "experimental_target_platforms": ["linux_aarch64"],
+            "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_extra_62833036": {
+            "dep_template": "@pypi//{name}:{target}",
+            "experimental_target_platforms": ["linux_x86_64"],
             "filename": "package-0.7.0-py3-none-any.whl",
             "python_interpreter_target": "unit_test_interpreter_target",
-            # NOTE(hartikainen): Perhaps this is part of the problem?
-            # This should say `package[extra]==0.7.0` for `linux_x86_64` platform and
-            # `package==0.7.0` for `linux_aarch64`
             "requirement": "package[extra]==0.7.0",
             "sha256": "62833036cbaf4641d66ae94c61c0446890a91b2c0d153946583a0ebe04877a76",
-            "urls": ["https://example.com/package-0.7.0-py3-none-any.whl"],
+            "urls": ["https://example.com/package/package-0.7.0-py3-none-any.whl"],
         },
     })
     pypi.whl_mods().contains_exactly({})