finish impl

Author: aignas

python/private/py_library.bzl

@@ -290,16 +290,22 @@ def _get_venv_symlinks(ctx, dist_info_metadata):
             venv_path = dist_info_dir,
         ))
 
-    for src in ctx.files.srcs:
-        if src.extension not in PYTHON_FILE_EXTENSIONS:
-            continue
+    for src in ctx.files.srcs + ctx.files.data:
         path = _repo_relative_short_path(src.short_path)
         if not path.startswith(site_packages_root):
             continue
         path = path.removeprefix(site_packages_root)
         dir_name, _, filename = path.rpartition("/")
 
-        if dir_name and filename.startswith("__init__."):
+        if src.extension not in PYTHON_FILE_EXTENSIONS:
+            if dir_name.endswith(".dist-info"):
+                # we have already handled the stuff
+                pass
+            elif dir_name:
+                # TODO @aignas 2025-05-30: is this the right way?
+                dirs_with_init[dir_name] = None
+                repo_runfiles_dirname = runfiles_root_path(ctx, src.short_path).partition("/")[0]
+        elif dir_name and filename.startswith("__init__."):
             dirs_with_init[dir_name] = None
             repo_runfiles_dirname = runfiles_root_path(ctx, src.short_path).partition("/")[0]
         elif not dir_name:

tests/modules/other/simple_v2/BUILD.bazel

@@ -11,4 +11,5 @@ py_library(
     ),
     experimental_venvs_site_packages = "@rules_python//python/config_settings:venvs_site_packages",
     imports = [package_name() + "/site-packages"],
+    pyi_srcs = glob(["**/*.pyi"]),
 )

tests/modules/other/simple_v2/site-packages/simple.libs/data.txt

@@ -0,0 +1 @@
+Intentionally empty

tests/modules/other/simple_v2/site-packages/simple/__init__.pyi

@@ -0,0 +1 @@
+# Intentionally empty

tests/venv_site_packages_libs/bin.py

@@ -1,5 +1,4 @@
 import importlib
-import os
 import sys
 import unittest
 from pathlib import Path
@@ -30,13 +29,37 @@ def test_imported_from_venv(self):
         self.assert_imported_from_venv("single_file")
         self.assert_imported_from_venv("simple")
 
-    def test_distinfo_is_overriden(self):
+    def test_pyi_is_included(self):
+        self.assert_imported_from_venv("simple")
+        module = importlib.import_module("simple")
+        module_path = Path(module.__file__)
+
+        # this has been not included through data but through `pyi_srcs`
+        pyi_files = [p.name for p in module_path.parent.glob("*.pyi")]
+        self.assertIn("__init__.pyi", pyi_files)
+
+    def test_data_is_included(self):
+        self.assert_imported_from_venv("simple")
+        module = importlib.import_module("simple")
+        module_path = Path(module.__file__)
+
+        site_packages = module_path.parent.parent
+
+        # Ensure that packages from simple v1 are not present
+        files = [p.name for p in site_packages.glob("*")]
+        self.assertIn("simple.libs", files)
+
+    def test_override_pkg(self):
         self.assert_imported_from_venv("simple")
         module = importlib.import_module("simple")
         self.assertEqual(
             "2.0.0",
             module.__version__,
         )
+
+    def test_dirs_from_replaced_package_are_not_present(self):
+        self.assert_imported_from_venv("simple")
+        module = importlib.import_module("simple")
         module_path = Path(module.__file__)
 
         site_packages = module_path.parent.parent
@@ -48,10 +71,7 @@ def test_distinfo_is_overriden(self):
 
         # Ensure that packages from simple v1 are not present
         files = [p.name for p in site_packages.glob("*")]
-        self.assertNotIn(
-            "simple_extras",
-            files,
-        )
+        self.assertNotIn("simple_extras", files)
 
 
 if __name__ == "__main__":