Merge branch 'main' into rv-pip

Author: aignas

docs/conf.py

@@ -123,7 +123,7 @@
 extlinks = {
     "gh-issue": (f"https://github.com/bazel-contrib/rules_python/issues/%s", "#%s issue"),
     "gh-path": (f"https://github.com/bazel-contrib/rules_python/tree/main/%s", "%s"),
-    "gh-pr": (f"https://github.com/bazel-contrib/rules_python/pulls/%s", "#%s PR"),
+    "gh-pr": (f"https://github.com/bazel-contrib/rules_python/pull/%s", "#%s PR"),
 }
 
 # --- MyST configuration

tests/venv_site_packages_libs/BUILD.bazel

@@ -28,6 +28,7 @@ py_reconfig_test(
     venvs_site_packages = "yes",
     deps = [
         ":closer_lib",
+        "//tests/venv_site_packages_libs/nested_with_pth",
         "//tests/venv_site_packages_libs/nspkg_alpha",
         "//tests/venv_site_packages_libs/nspkg_beta",
         "//tests/venv_site_packages_libs/pkgutil_top",

tests/venv_site_packages_libs/bin.py

@@ -40,6 +40,8 @@ def test_imported_from_venv(self):
         self.assert_imported_from_venv("nspkg.subnspkg.delta")
         self.assert_imported_from_venv("single_file")
         self.assert_imported_from_venv("simple")
+        m = self.assert_imported_from_venv("nested_with_pth")
+        self.assertEqual(m.WHOAMI, "nested_with_pth")
 
     def test_data_is_included(self):
         self.assert_imported_from_venv("simple")

tests/venv_site_packages_libs/nested_with_pth/BUILD.bazel

@@ -0,0 +1,11 @@
+load("//python:py_library.bzl", "py_library")
+
+package(default_visibility = ["//visibility:public"])
+
+py_library(
+    name = "nested_with_pth",
+    srcs = glob(["site-packages/**/*.py"]),
+    data = glob(["site-packages/*.pth"]),
+    experimental_venvs_site_packages = "//python/config_settings:venvs_site_packages",
+    imports = [package_name() + "/site-packages"],
+)

tests/venv_site_packages_libs/nested_with_pth/site-packages/nested.pth

@@ -0,0 +1 @@
+nested_sdk

tests/venv_site_packages_libs/nested_with_pth/site-packages/nested_sdk/nested_with_pth/__init__.py

@@ -0,0 +1 @@
+WHOAMI = "nested_with_pth"