comment: pass pkg with version

Author: aignas

python/private/py_executable.bzl

@@ -686,19 +686,25 @@ def _build_link_map(entries):
     # Here we store venv paths by package
     # dict[str package, dict[str kind, list[str venv_path]]]
     pkg_map = {}
+
     for entry in entries:
         kind = entry.kind
         kind_map = link_map.setdefault(kind, {})
 
+        # TODO @aignas 2025-05-31: explain where we use the version
+        package = None
+        if entry.package:
+            package, _, _version = entry.package.partition("-")
+
         # If we detect that we are adding a dist-info for an already existing package
         # we need to pop all of the previous symlinks from the link_map
-        if entry.venv_path.endswith(".dist-info") and entry.package in pkg_map:
+        if entry.venv_path.endswith(".dist-info") and package in pkg_map:
             # dist-info will come always first
-            for kind, dir_paths in pkg_map.pop(entry.package).items():
+            for kind, dir_paths in pkg_map.pop(package).items():
                 for dir_path in dir_paths:
                     link_map[kind].pop(dir_path)
 
-        pkg_venv_paths = pkg_map.setdefault(entry.package, {}).setdefault(entry.kind, [])
+        pkg_venv_paths = pkg_map.setdefault(package, {}).setdefault(entry.kind, [])
         pkg_venv_paths.append(entry.venv_path)
 
         # We overwrite duplicates by design. The dependency closer to the

python/private/py_library.bzl

@@ -53,6 +53,7 @@ load(
     "EXEC_TOOLS_TOOLCHAIN_TYPE",
     TOOLCHAIN_TYPE = "TARGET_TOOLCHAIN_TYPE",
 )
+load(":version.bzl", "version")
 
 _py_builtins = py_internal
 
@@ -279,8 +280,11 @@ def _get_venv_symlinks(ctx, dist_info_metadata):
         # directories by checking if the package key is there.
         dist_info_dir = paths.basename(dist_info_metadata.dirname)
         package, _, _suffix = dist_info_dir.rpartition(".dist-info")
-        package, _, _version = package.rpartition("-")
-        package = normalize_name(package)
+        package, _, version_str = package.rpartition("-")
+        package = "{}-{}".format(
+            normalize_name(package),
+            version.normalize(version_str),
+        )
 
         repo_runfiles_dirname = runfiles_root_path(ctx, dist_info_metadata.short_path).partition("/")[0]
         venv_symlinks.append(VenvSymlinkEntry(