refactor(tests): convert legacy py_extension in local_toolchains to official rule

python/private/get_local_runtime_info.py

@@ -268,7 +268,9 @@ def _get_base_executable() -> str:
     "implementation_name": sys.implementation.name,
     "base_executable": _get_base_executable(),
     "sys_platform": sys.platform,
-    "platform_machine": platform.machine(),
+    # Normalize to lowercase: on Windows, platform.machine() returns uppercase
+    # "AMD64" / "ARM64", whereas PEP 508 and toolchains expect lowercase.
+    "platform_machine": platform.machine().lower(),
 }
 data.update(_get_python_library_info(_get_base_executable()))
 print(json.dumps(data))

python/private/local_runtime_repo_setup.bzl

@@ -137,13 +137,21 @@ def define_local_runtime_toolchain_impl(
         hdrs = [":includes"],
         defines = defines,  # NOTE: Users should define Py_LIMITED_API=3
         srcs = abi3_libraries + additional_dlls,
+        deps = select({
+            "@bazel_tools//src/conditions:windows": [":abi3_interface"],
+            "//conditions:default": [],
+        }),
     )
 
     cc_library(
         name = "libpython",
         hdrs = [":includes"],
         defines = defines,
         srcs = libraries + additional_dlls,
+        deps = select({
+            "@bazel_tools//src/conditions:windows": [":interface"],
+            "//conditions:default": [],
+        }),
     )
 
     # runtime configuration

tests/integration/local_toolchains/BUILD.bazel

@@ -13,9 +13,8 @@
 # limitations under the License.
 
 load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
-load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_python//python:py_test.bzl", "py_test")
-load(":py_extension.bzl", "py_extension")
+load("@rules_python//python/cc:py_extension.bzl", "py_extension")
 
 py_test(
     name = "local_runtime_test",
@@ -60,28 +59,24 @@ string_flag(
 )
 
 # Build rules to generate a python extension.
-cc_library(
-    name = "echo_ext_cc",
-    testonly = True,
-    srcs = ["echo_ext.cc"],
-    deps = [
-        "@rules_python//python/cc:current_py_cc_headers",
-    ],
-    alwayslink = True,
-)
-
 py_extension(
     name = "echo_ext",
     testonly = True,
+    srcs = ["echo_ext.cc"],
     copts = select({
         "@rules_cc//cc/compiler:msvc-cl": [],
         "//conditions:default": ["-fvisibility=hidden"],
     }),
-    deps = [":echo_ext_cc"],
+    imports = ["."],
 )
 
 py_test(
     name = "echo_test",
     srcs = ["echo_test.py"],
+    # Make this test better respect pyenv/local Python DLLs on Windows
+    env_inherit = [
+        "PYENV_VERSION",
+        "PATH",
+    ],
     deps = [":echo_ext"],
 )

tests/integration/local_toolchains/echo_test.py

@@ -5,4 +5,4 @@
 
 class ExtensionTest(unittest.TestCase):
     def test_echo_extension(self):
-        self.assertEqual(echo_ext.echo(42, "str"), tuple(42, "str"))
+        self.assertEqual(echo_ext.echo(42, "str"), (42, "str"))