wip

Author: aignas

python/private/pypi/generate_whl_library_build_bazel.bzl

@@ -20,6 +20,7 @@ load(":labels.bzl", "DATA_LABEL", "DIST_INFO_LABEL", "EXTRACTED_WHEEL_FILES", "P
 # These are functions on how to render particular args, should be reused across all rendering
 # invocations to make things easier.
 _RENDER_FNS = {
+    "aliases": render.list,
     "copy_executables": render.dict,
     "copy_files": render.dict,
     "data": render.list,
@@ -109,15 +110,6 @@ def generate_whl_library_build_bazel(
         namespace_package_files = namespace_package_files,
         visibility = visibility,
     )
-    from_requires_kwargs = dict(
-        name = metadata_name,
-        version = metadata_version,
-        requires_dist = requires_dist,
-        extras = extras,
-        group_deps = group_deps,
-        dep_template = dep_template,
-        group_name = group_name,
-    )
 
     # NOTE, if users specify annotations, the wheel downloads are not reused this
     # is to ensure that we don't break users config and also to ensure that we
@@ -147,14 +139,25 @@ def generate_whl_library_build_bazel(
         ),
     ]
 
-    if config_load:
-        loads.append("""load("{}", "{}")""".format(config_load, "packages"))
-        from_requires_kwargs["include"] = "packages"
+    if dep_template:
+        from_requires_kwargs = dict(
+            name = metadata_name,
+            version = metadata_version,
+            requires_dist = requires_dist,
+            extras = extras,
+            group_deps = group_deps,
+            dep_template = dep_template,
+            group_name = group_name,
+        )
 
-    macro_parts.append(render.call(
-        "whl_library_from_requires_dist",
-        **_render(**from_requires_kwargs)
-    ))
+        if config_load:
+            loads.append("""load("{}", "{}")""".format(config_load, "packages"))
+            from_requires_kwargs["include"] = "packages"
+
+        macro_parts.append(render.call(
+            "whl_library_from_requires_dist",
+            **_render(**from_requires_kwargs)
+        ))
 
     contents = "\n".join(
         [
@@ -174,6 +177,7 @@ def generate_whl_library_deps_build_bazel(
         version,
         config_load,
         dep_template,
+        entry_points,
         extras,
         group_deps,
         group_name,
@@ -200,31 +204,24 @@ def generate_whl_library_deps_build_bazel(
         dep_template = dep_template,
         group_name = group_name,
         src_pkg = str(whl_library),
-    )
-
-    macro_parts = [
-        render.call(
-            "alias",
-            **_render(
-                name = target,
-                actual = str(whl_library.same_package_label(target)),
-            )
-        )
-        for target in [
+        aliases = [
             DATA_LABEL,
             DIST_INFO_LABEL,
             EXTRACTED_WHEEL_FILES,
-        ]
-    ]
+        ] + [
+            "bin/{}".format(entry_point)
+            for entry_point in entry_points
+        ],
+    )
 
     if config_load:
         loads.append("""load("{}", "{}")""".format(config_load, "packages"))
         from_requires_kwargs["include"] = "packages"
 
-    macro_parts.append(render.call(
+    macro_parts = [render.call(
         "whl_library_from_requires_dist",
         **_render(**from_requires_kwargs)
-    ))
+    )]
 
     contents = _TEMPLATE.format(
         loads = "\n".join(loads),

python/private/pypi/whl_library.bzl

@@ -442,7 +442,7 @@ def _whl_library_impl(rctx):
         sdist_filename = sdist_filename,
         dep_template = rctx.attr.dep_template or "@{}{{name}}//:{{target}}".format(
             rctx.attr.repo_prefix,
-        ),
+        ) if rctx.attr.dep_template or rctx.attr.repo_prefix else "",
         config_load = rctx.attr.config_load,
         metadata_name = metadata.name,
         metadata_version = metadata.version,
@@ -631,6 +631,11 @@ def _whl_library_deps_impl(rctx):
     # Load the METADATA file from a different repository
     metadata_path = rctx.path(rctx.attr.whl_library.same_package_label("METADATA"))
     metadata = parse_whl_metadata(rctx.read(metadata_path))
+    entry_points = _get_entry_points(
+        rctx,
+        rctx.path(metadata_path).dirname.get_child("site-packages"),
+        metadata,
+    )
 
     if not (metadata.name and metadata.version):
         logger.fail("Failed to parse METADATA from {}".format(rctx.attr.whl_library))
@@ -644,6 +649,7 @@ def _whl_library_deps_impl(rctx):
         extras = rctx.attr.extras,
         group_deps = rctx.attr.group_deps,
         group_name = rctx.attr.group_name,
+        entry_points = [e["name"] for e in entry_points.values()],
         requires_dist = metadata.requires_dist,
         whl_library = rctx.attr.whl_library,
     )

python/private/pypi/whl_library_targets.bzl

@@ -120,6 +120,7 @@ def whl_library_targets(
         dependencies_with_markers = {},
         group_name = "",
         native = native,
+        aliases = [],
         src_pkg = Label("//:BUILD.bazel"),
         rules = struct(
             copy_file = copy_file,
@@ -231,6 +232,13 @@ def whl_library_targets(
         visibility = impl_vis,
     )
 
+    for target in aliases:
+        native.alias(
+            name = target,
+            actual = src_pkg.same_package_label(target),
+            visibility = ["//visibility:public"],
+        )
+
 def _config_settings(dependencies_with_markers, rules, **kwargs):
     """Generate config settings for the targets.