Enable extras in {whl,pypi}_repo_name

Author: hartikainen

python/private/pypi/hub_builder.bzl

@@ -538,6 +538,7 @@ def _whl_repo(
                 repo_name = pypi_repo_name(
                     whl_name = normalize_name(src.distribution),
                     target_platforms = target_platforms,
+                    extras = src.extras,
                 ),
                 args = args,
                 config_setting = whl_config_setting(
@@ -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,

python/private/pypi/parse_requirements.bzl

@@ -274,6 +274,7 @@ def _package_srcs(
                     sha256 = dist.sha256,
                     url = dist.url,
                     yanked = dist.yanked,
+                    extras = requirement(r.requirement_line).extras,
                 ),
             )
 

python/private/pypi/whl_repo_name.bzl

@@ -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:
@@ -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:
@@ -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)