fixup

Author: aignas

python/private/pypi/whl_library.bzl

@@ -695,7 +695,7 @@ def _whl_library_deps_impl(rctx):
     ] + [
         "    {} = {},".format(k, repr(v))
         for k, v in sorted(from_requires_kwargs.items())
-        if v or k in ("name", "requires_dist", "dep_template", "nodeps_pkg", "src_pkg")
+        if v or k in ("name", "requires_dist", "dep_template", "src_pkg")
     ] + [
         ")",
         "",

python/private/pypi/whl_library_targets.bzl

@@ -125,7 +125,6 @@ def whl_library_targets(
         copy_files = {},
         copy_executables = {},
         native = native,
-        nodeps_pkg = "",
         src_pkg = Label("//:BUILD.bazel"),
         rules = struct(
             copy_file = copy_file,
@@ -155,15 +154,12 @@ def whl_library_targets(
             dest locations for the targets.
         copy_files: {type}`dict[str, str]` The mapping between src and
             dest locations for the targets.
-        nodeps_pkg: {type}`str` The package prefix for the no-deps targets
-            (e.g., "@repo//:"). When empty, defaults to the current package.
         src_pkg: TODO
         data: {type}`list[str]` A list of labels to include as part of the `data` attribute in `py_library`.
         native: {type}`native` The native struct for overriding in tests.
         rules: {type}`struct` A struct with references to rules for creating targets.
     """
     src_pkg = Label(src_pkg)
-    print(src_pkg)
     for src, dest in copy_files.items():
         rules.copy_file(
             name = dest + ".copy",
@@ -243,7 +239,7 @@ def whl_library_targets(
     dependencies = sorted([normalize_name(d) for d in dependencies])
     native.filegroup(
         name = whl_file_label,
-        srcs = [nodeps_pkg + NODEPS_WHL_FILE_LABEL],
+        srcs = [src_pkg.same_package_label(NODEPS_WHL_FILE_LABEL)],
         data = _deps(
             deps = dependencies,
             deps_conditional = deps_conditional,
@@ -253,7 +249,7 @@ def whl_library_targets(
     )
     rules.py_library(
         name = py_library_label,
-        deps = [nodeps_pkg + NODEPS_PY_LIBRARY_LABEL] + _deps(
+        deps = [src_pkg.same_package_label(NODEPS_PY_LIBRARY_LABEL)] + _deps(
             deps = dependencies,
             deps_conditional = deps_conditional,
             tmpl = dep_template.format(name = "{}", target = PY_LIBRARY_PUBLIC_LABEL),