a better included packages passing

Author: aignas

python/private/internal_dev_deps.bzl

@@ -40,7 +40,6 @@ def _internal_dev_deps_impl(mctx):
         name = "somepkg_with_build_files",
         whl_file = "@whl_with_build_files//:somepkg-1.0-any-none-any.whl",
         requirement = "somepkg",
-        packages = ["dummy"],
     )
 
     # Setup for //tests/implicit_namespace_packages
@@ -54,7 +53,6 @@ def _internal_dev_deps_impl(mctx):
         whl_file = "@implicit_namespace_ns_sub1_whl//:ns_sub1-1.0-any-none-any.whl",
         requirement = "ns-sub1",
         enable_implicit_namespace_pkgs = False,
-        packages = ["dummy"],
     )
 
     whl_from_dir_repo(
@@ -67,7 +65,6 @@ def _internal_dev_deps_impl(mctx):
         whl_file = "@implicit_namespace_ns_sub2_whl//:ns_sub2-1.0-any-none-any.whl",
         requirement = "ns-sub2",
         enable_implicit_namespace_pkgs = False,
-        packages = ["dummy"],
     )
 
 internal_dev_deps = module_extension(

python/private/pypi/generate_whl_library_build_bazel.bzl

@@ -85,9 +85,7 @@ def generate_whl_library_build_bazel(
         ]
         dep_template = kwargs.get("dep_template")
         packages = kwargs.pop("packages", [])
-        if packages:
-            kwargs["include"] = render.list(packages)
-        else:
+        if dep_template:
             loads.append(
                 """load("{}", "{}")""".format(
                     dep_template.format(
@@ -98,6 +96,8 @@ def generate_whl_library_build_bazel(
                 ),
             )
             kwargs["include"] = "packages"
+        elif packages:
+            kwargs["include"] = render.list(packages)
 
     for arg in unsupported_args:
         if kwargs.get(arg):

python/private/pypi/whl_library.bzl

@@ -419,10 +419,18 @@ def _whl_library_impl(rctx):
             logger = logger,
         )
 
+        dep_template = rctx.attr.dep_template
+
+        # packages will be set in tests or WORKSPACE
+        if rctx.attr.packages:
+            dep_template = dep_template or "@{}{{name}}//:{{target}}".format(
+                rctx.attr.repo_prefix,
+            )
+
         build_file_contents = generate_whl_library_build_bazel(
             name = whl_path.basename,
             sdist_filename = sdist_filename,
-            dep_template = rctx.attr.dep_template or "@{}{{name}}//:{{target}}".format(rctx.attr.repo_prefix),
+            dep_template = dep_template,
             packages = rctx.attr.packages,
             entry_points = entry_points,
             metadata_name = metadata.name,