fix the dep wiring in WORKSPACE

Author: aignas

python/private/pypi/generate_whl_library_build_bazel.bzl

@@ -85,19 +85,13 @@ def generate_whl_library_build_bazel(
         ]
         dep_template = kwargs.get("dep_template")
         packages = kwargs.pop("packages", [])
-        if dep_template:
-            loads.append(
-                """load("{}", "{}")""".format(
-                    dep_template.format(
-                        name = "",
-                        target = "requirements.bzl",
-                    ),
-                    "packages",
-                ),
-            )
-            kwargs["include"] = "packages"
-        elif packages:
-            kwargs["include"] = render.list(packages)
+        if kwargs.get("requires_dist"):
+            packages_load = dep_template.format(name = "", target = "requirements.bzl")
+            if "_//" in packages_load:
+                kwargs["include"] = render.list(packages)
+            else:
+                loads.append("""load("{}", "{}")""".format(packages_load, "packages"))
+                kwargs["include"] = "packages"
 
     for arg in unsupported_args:
         if kwargs.get(arg):

python/private/pypi/whl_library.bzl

@@ -421,16 +421,12 @@ def _whl_library_impl(rctx):
 
         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 = dep_template,
+            dep_template = dep_template or "@{}{{name}}//:{{target}}".format(
+                rctx.attr.repo_prefix,
+            ),
             packages = rctx.attr.packages,
             entry_points = entry_points,
             metadata_name = metadata.name,