move the requirement line parsing to starlark

Author: aignas

python/private/pypi/whl_installer/wheel_installer.py

@@ -103,7 +103,6 @@ def _setup_namespace_pkg_compatibility(wheel_dir: str) -> None:
 
 def _extract_wheel(
     wheel_file: str,
-    extras: Dict[str, Set[str]],
     enable_implicit_namespace_pkgs: bool,
     installation_dir: Path = Path("."),
 ) -> None:
@@ -112,7 +111,6 @@ def _extract_wheel(
     Args:
         wheel_file: the filepath of the .whl
         installation_dir: the destination directory for installation of the wheel.
-        extras: a list of extras to add as dependencies for the installed wheel
         enable_implicit_namespace_pkgs: if true, disables conversion of implicit namespace packages and will unzip as-is
     """
 
@@ -122,13 +120,11 @@ def _extract_wheel(
     if not enable_implicit_namespace_pkgs:
         _setup_namespace_pkg_compatibility(installation_dir)
 
-    extras_requested = extras[whl.name] if whl.name in extras else set()
     requires_dist = whl.metadata.get_all("Requires-Dist", [])
     abi = f"cp{sys.version_info.major}{sys.version_info.minor}"
     metadata = {
         "name": whl.name,
         "version": whl.version,
-        "extras": list(extras_requested),
         "python_version": sys.version.partition(" ")[0],
         "requires_dist": requires_dist,
         "abi": abi,
@@ -157,11 +153,8 @@ def main() -> None:
     if args.whl_file:
         whl = Path(args.whl_file)
 
-        name, extras_for_pkg = _parse_requirement_for_extra(args.requirement)
-        extras = {name: extras_for_pkg} if extras_for_pkg and name else dict()
         _extract_wheel(
             wheel_file=whl,
-            extras=extras,
             enable_implicit_namespace_pkgs=args.enable_implicit_namespace_pkgs,
         )
         return

python/private/pypi/whl_library.bzl

@@ -25,6 +25,7 @@ load(":parse_requirements.bzl", "host_platform")
 load(":parse_whl_name.bzl", "parse_whl_name")
 load(":patch_whl.bzl", "patch_whl")
 load(":pep508_deps.bzl", "deps")
+load(":pep508_requirement.bzl", "requirement")
 load(":pypi_repo_utils.bzl", "pypi_repo_utils")
 load(":whl_target_platforms.bzl", "whl_target_platforms")
 
@@ -430,7 +431,7 @@ def _whl_library_impl(rctx):
         platforms = target_platforms or [
             "{}_{}".format(metadata["abi"], host_platform(rctx)),
         ],
-        extras = metadata["extras"],
+        extras = requirement(rctx.attr.requirement).extras,
         host_python_version = metadata["python_version"],
     )