Merge and fix changelog

Of branch 'feat-pypi-all-files-extracted' into feat.pypi.all.files

Author: rickeylev

CHANGELOG.md

@@ -65,6 +65,10 @@ END_UNRELEASED_TEMPLATE
 * (pypi) To configure the environment for `requirements.txt` evaluation, use the newly added
   developer preview of the `pip.default` tag class. Only `rules_python` and root modules can use
   this feature. You can also configure `constraint_values` using `pip.default`.
+* (pypi) PyPI dependencies now expose an `:extracted_whl_files` filegroup target
+  of all the files extracted from the wheel. This can be used in lieu of
+  {obj}`whl_filegroup` to avoid copying/extracting wheel multiple times to
+  get a subset of their files.
 
 {#v0-0-0-removed}
 ### Removed

docs/pypi/use.md

@@ -40,6 +40,8 @@ Note, that the hub repo contains the following targets for each package:
 * `@pypi//numpy:data` - the {obj}`filegroup` that is for all of the extra files that are included
   as data in the `pkg` target.
 * `@pypi//numpy:dist_info` - the {obj}`filegroup` that is for all of the files in the `<pkg prefix with version>.distinfo` directory.
+* `@pypi//numpy:extracted_whl_files` - a {obj}`filegroup` of all the files
+  extracted from the whl file.
 * `@pypi//numpy:whl` - the {obj}`filegroup` that is the `.whl` file itself which includes all of
   the transitive dependencies via the {attr}`filegroup.data` attribute.
 

python/private/pypi/pkg_aliases.bzl

@@ -79,6 +79,7 @@ load(
     ":labels.bzl",
     "DATA_LABEL",
     "DIST_INFO_LABEL",
+    "EXTRACTED_WHEEL_FILES",
     "PY_LIBRARY_IMPL_LABEL",
     "PY_LIBRARY_PUBLIC_LABEL",
     "WHEEL_FILE_IMPL_LABEL",
@@ -151,6 +152,7 @@ def pkg_aliases(
         WHEEL_FILE_PUBLIC_LABEL: WHEEL_FILE_IMPL_LABEL if group_name else WHEEL_FILE_PUBLIC_LABEL,
         DATA_LABEL: DATA_LABEL,
         DIST_INFO_LABEL: DIST_INFO_LABEL,
+        EXTRACTED_WHEEL_FILES: EXTRACTED_WHEEL_FILES,
     } | {
         x: x
         for x in extra_aliases or []

python/private/pypi/whl_library_targets.bzl

@@ -101,18 +101,6 @@ def whl_library_targets(
         data_exclude = [],
         srcs_exclude = [],
         tags = [],
-        filegroups = {
-            EXTRACTED_WHEEL_FILES: dict(
-                include = ["**"],
-                exclude = ["*.whl"],
-            ),
-            DIST_INFO_LABEL: dict(
-                include = ["site-packages/*.dist-info/**"],
-            ),
-            DATA_LABEL: dict(
-                include = ["data/**"],
-            ),
-        },
         dependencies = [],
         dependencies_by_platform = {},
         dependencies_with_markers = {},
@@ -177,7 +165,22 @@ def whl_library_targets(
     tags = sorted(tags)
     data = [] + data
 
-    for filegroup_name, glob_kwargs in filegroups.items():
+    _filegroups = {
+        # TODO(#3011): Consider parsing the RECORD file to get a precise list of files
+        # instead of relying on a glob with excludes.
+        EXTRACTED_WHEEL_FILES: dict(
+            include = ["**"],
+            exclude = [name],
+        ),
+        DIST_INFO_LABEL: dict(
+            include = ["site-packages/*.dist-info/**"],
+        ),
+        DATA_LABEL: dict(
+            include = ["data/**"],
+        ),
+    }
+
+    for filegroup_name, glob_kwargs in _filegroups.items():
         glob_kwargs = {"allow_empty": True} | glob_kwargs
         native.filegroup(
             name = filegroup_name,

python/private/whl_filegroup/whl_filegroup.bzl

@@ -42,7 +42,14 @@ cc_library(
     includes = ["numpy_includes/numpy/core/include"],
     deps = ["@rules_python//python/cc:current_py_cc_headers"],
 )
+
 ```
+
+:::{seealso}
+
+The `:extracted_whl_files` target, which is a filegroup of all the files
+from the already extracted whl file.
+:::
 """,
     attrs = {
         "pattern": attr.string(default = "", doc = "Only file paths matching this regex pattern will be extracted."),