wip

Author: aignas

python/private/pypi/extension.bzl

@@ -518,24 +518,23 @@ You cannot use both the additive_build_content and additive_build_content_file a
             )
 
     for hub in pip_hub_map.values():
+        out = hub.build()
         hub_whl_map.setdefault(hub.name, {})
-        for key, settings in hub.whl_map.items():
+        for key, settings in out.whl_map.items():
             for setting, repo in settings.items():
                 hub_whl_map[hub.name].setdefault(key, {}).setdefault(repo, []).append(setting)
 
-        for whl_name, aliases in hub.extra_aliases.items():
-            extra_aliases[hub.name].setdefault(whl_name, {}).update(aliases)
-
-        whl_libraries.update(hub.whl_libraries)
-        for whl_name, lib in hub.whl_libraries.items():
+        for whl_name, lib in out.whl_libraries.items():
             if whl_name in lib:
                 fail("'{}' already in created".format(whl_name))
             else:
                 # replicate whl_libraries.update(out.whl_libraries)
                 whl_libraries[whl_name] = lib
 
-        hub_group_map[hub.name] = hub.group_map
-        exposed_packages[hub.name] = hub.exposed_packages
+        hub_whl_map[hub.name] = out.whl_map
+        extra_aliases[hub.name] = out.extra_aliases
+        hub_group_map[hub.name] = out.group_map
+        exposed_packages[hub.name] = out.exposed_packages
 
     return struct(
         # We sort so that the lock-file remains the same no matter the order of how the

python/private/pypi/hub_builder.bzl

@@ -59,6 +59,7 @@ def hub_builder(
         exposed_packages = {},
         extra_aliases = {},
         whl_libraries = {},
+        group_map = {},
         _evaluate_markers_fn = evaluate_markers_fn,
         _logger = logger,
         _minor_mapping = minor_mapping,
@@ -79,11 +80,21 @@ def hub_builder(
             python_version in self._get_index_urls,
         ),
         evaluate_markers = lambda *a, **k: _evaluate_markers(self, *a, **k),
+        build = lambda: _build(self),
     )
 
     # buildifier: enable=uninitialized
     return self
 
+def _build(self):
+    return struct(
+        whl_map = self.whl_map,
+        exposed_packages = self.exposed_packages,
+        extra_aliases = self.extra_aliases,
+        whl_libraries = self.whl_libraries,
+        group_map = self.group_map,
+    )
+
 def _add(self, *, pip_attr):
     python_version = pip_attr.python_version
     if python_version in self.python_versions:
@@ -114,7 +125,8 @@ def _add(self, *, pip_attr):
     # cycles for different abis/oses? For now we will need the users to
     # assume the same groups across all versions/platforms until we start
     # using an alternative cycle resolution strategy.
-    self.group_map = pip_attr.experimental_requirement_cycles
+    self.group_map.clear()
+    self.group_map.update(pip_attr.experimental_requirement_cycles)
 
 def _set_index_urls(self, pip_attr):
     if not pip_attr.experimental_index_url: