fixup

Author: aignas

examples/pip_parse_vendored/requirements.bzl

@@ -4,7 +4,7 @@
 """
 
 load("@rules_python//python:pip.bzl", "pip_utils")
-load("@rules_python//python/pip_install:pip_repository.bzl", "group_library", "whl_config_repository", "whl_library")
+load("@rules_python//python/pip_install:pip_repository.bzl", "whl_config_repository", "whl_library")
 
 all_requirements = [
     "@my_project_pip_deps_vendored_certifi//:pkg",
@@ -91,16 +91,11 @@ def install_deps(**whl_library_kwargs):
         for requirement in group_requirements
     }
 
-    group_repo = "my_project_pip_deps_vendored__config"
-    group_library(
-        name = group_repo,
-        repo_prefix = "my_project_pip_deps_vendored_",
-        groups = all_requirement_groups,
-    )
-
     config_repo = "my_project_pip_deps_vendored__config"
     whl_config_repository(
         name = config_repo,
+        repo_prefix = "my_project_pip_deps_vendored_",
+        groups = all_requirement_groups,
         whl_map = {
             p: ""
             for p in all_whl_requirements_by_package

python/pip_install/BUILD.bazel

@@ -22,9 +22,9 @@ bzl_library(
     name = "pip_repository_bzl",
     srcs = ["pip_repository.bzl"],
     deps = [
-        "//python/private/pypi:group_library_bzl",
         "//python/private/pypi:package_annotation_bzl",
         "//python/private/pypi:pip_repository_bzl",
+        "//python/private/pypi:whl_config_library_bzl",
         "//python/private/pypi:whl_library_bzl",
     ],
 )

python/private/pypi/pip_repository.bzl

@@ -156,7 +156,7 @@ def _pip_repository_impl(rctx):
     imports = [
         # NOTE: Maintain the order consistent with `buildifier`
         'load("@rules_python//python:pip.bzl", "pip_utils")',
-        'load("@rules_python//python/pip_install:pip_repository.bzl", "group_library", "whl_config_repository", "whl_library")',
+        'load("@rules_python//python/pip_install:pip_repository.bzl", "whl_config_repository", "whl_library")',
     ]
 
     annotations = {}

python/private/pypi/whl_config_repository.bzl

@@ -27,7 +27,6 @@ whl_config_repository = repository_rule(
             doc = "Prefix used for the whl_library created components of each group",
         ),
         "whl_map": attr.string_dict(
-            mandatory = True,
             doc = """\
 The wheel map where values are json.encoded strings of the whl_map constructed
 in the pip.parse tag class.