From 82144224d5b5e6738e8b4ea962d1a7bfcf6f3000 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Fri, 26 Jun 2026 19:28:55 +0000 Subject: [PATCH 01/42] Don't leave a trailing slash for the root package. --- python/private/cc/py_extension_rule.bzl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 19a0281288..23a387b140 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -13,7 +13,9 @@ load("//python/private:toolchain_types.bzl", "TARGET_TOOLCHAIN_TYPE") def _py_extension_impl(ctx): module_name = ctx.attr.module_name or ctx.label.name repo_name = ctx.label.workspace_name or ctx.workspace_name - import_path = repo_name + "/" + ctx.label.package + import_path = repo_name + if ctx.label.package: + import_path = repo_name + "/" + ctx.label.package cc_toolchain = ctx.toolchains["@bazel_tools//tools/cpp:toolchain_type"].cc feature_configuration = cc_common.configure_features( ctx = ctx, From 1e89b9972ba66c47865f66d20a1282ccd39aa6c2 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Fri, 26 Jun 2026 19:32:08 +0000 Subject: [PATCH 02/42] Remove duplicate assignment. --- python/private/cc/py_extension_rule.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 23a387b140..a72a3a5f80 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -65,7 +65,6 @@ def _py_extension_impl(ctx): else: py_toolchain = ctx.toolchains[TARGET_TOOLCHAIN_TYPE] py_runtime = py_toolchain.py3_runtime - cc_toolchain = ctx.toolchains["@bazel_tools//tools/cpp:toolchain_type"].cc platform_tag = _get_platform(cc_toolchain) output_filename = "{module_name}.{pyc_tag}{abi_flags}-{platform}.{ext}".format( module_name = module_name, From d921d20912b79eb32abef5d471da1f5c3e61ffff Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Fri, 26 Jun 2026 19:36:22 +0000 Subject: [PATCH 03/42] Remove typical C-style integer suffixes before parsing. --- python/private/cc/py_extension_rule.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index a72a3a5f80..3f5124b4ed 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -380,7 +380,7 @@ def _check_limited_api_compatibility(ctx, ext_version_str): ext_hex = ext_version_hex, )) else: - dep_version_val = int(limited_api_define_value, 16) + dep_version_val = int(limited_api_define_value.rstrip("ULul"), 16) if dep_version_val > ext_version_val: fail(( "\nERROR: Incompatible Python Limited API targets detected\n" + From f318173e62cde2149f0f4b93e88ef9ef95f04b78 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Fri, 26 Jun 2026 19:42:26 +0000 Subject: [PATCH 04/42] Fix check for filename. --- tests/cc/py_extension/py_extension_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cc/py_extension/py_extension_test.py b/tests/cc/py_extension/py_extension_test.py index 252098a46a..3d71e453fd 100644 --- a/tests/cc/py_extension/py_extension_test.py +++ b/tests/cc/py_extension/py_extension_test.py @@ -11,7 +11,7 @@ class PyExtensionTest(unittest.TestCase): def test_inspect_elf(self): r = runfiles.Create() - ext_path = r.Rlocation("rules_python/tests/cc/py_extension/ext_shared.so") + ext_path = r.Rlocation("rules_python/tests/cc/py_extension/ext_shared.cpython-311-x86_64-linux-gnu.so") self.assertTrue( os.path.exists(ext_path), f"Could not find ext_shared.so at {ext_path}" ) From 80a9aae8f326bee4cf56a34c7a609ee27fa68224 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Fri, 26 Jun 2026 20:34:25 +0000 Subject: [PATCH 05/42] Remove unnecessary guard. --- python/private/cc/py_extension_rule.bzl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 3f5124b4ed..12373fdc06 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -122,8 +122,7 @@ def _py_extension_impl(ctx): runfiles = ctx.runfiles(files = [py_dso]) transitive_runfiles = [] for dep in ctx.attr.static_deps + ctx.attr.dynamic_deps + ctx.attr.external_deps: - if DefaultInfo in dep: - transitive_runfiles.append(dep[DefaultInfo].default_runfiles) + transitive_runfiles.append(dep[DefaultInfo].default_runfiles) runfiles = runfiles.merge_all(transitive_runfiles) return [ From 9bfc33112271567993133bb8da4b3b72229da4ca Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Fri, 26 Jun 2026 20:37:28 +0000 Subject: [PATCH 06/42] Re-format docstring. --- python/private/cc/py_extension_rule.bzl | 47 +++++++++++++------------ 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 12373fdc06..3ce2798a70 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -159,29 +159,30 @@ PY_EXTENSION_ATTRS = COMMON_ATTRS | { "linkopts": lambda: attrb.StringList(), "module_name": lambda: attrb.String(), "py_limited_api": lambda: attrb.String( - doc = """\ - The minimum Python version to target for the Limited API (e.g., '3.8'). - - If set to a version string (e.g., '3.8') instead of 'none': - - Configures the output filename to use the simple '.abi3' suffix (e.g., - 'ext.abi3.so'). - - Strictly validates that all linked C++ dependencies (static_deps, - dynamic_deps, etc.) are binary-compatible with this target version, - failing the build if a dependency is missing the 'Py_LIMITED_API' define - or targets a newer version. - - Note: Since the py_extension rule only links pre-compiled libraries, you must - manually add the preprocessor macro to the cc_library targets that compile your - C/C++ sources, for example: - cc_library( - name = "my_impl", - srcs = ["my_code.c"], - defines = ["Py_LIMITED_API=0x03080000"], - ... - ) - - Set to 'none' (the default) to build a standard, version-specific extension. - """, + doc = """ +The minimum Python version to target for the Limited API (e.g., '3.8'). + +If set to a version string (e.g., '3.8') instead of 'none': + - Configures the output filename to use the simple '.abi3' suffix + (e.g., 'ext.abi3.so'). + - Strictly validates that all linked C++ dependencies (static_deps, + dynamic_deps, etc.) are binary-compatible with this target version, + failing the build if a dependency is missing the 'Py_LIMITED_API' + define or targets a newer version. + +Note: Since the py_extension rule only links pre-compiled libraries, +you must manually add the preprocessor macro to the cc_library targets +that compile your C/C++ sources, for example: + cc_library( + name = "my_impl", + srcs = ["my_code.c"], + defines = ["Py_LIMITED_API=0x03080000"], + ... + ) + +Set to 'none' (the default) to build a standard, version-specific +extension. +""", default = "none" ), } From e85e06b1fd71c999910370877363e9fc02333f80 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Mon, 29 Jun 2026 20:34:30 +0000 Subject: [PATCH 07/42] Get the platform from the constraints. --- python/private/cc/py_extension_rule.bzl | 75 ++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 3 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 3ce2798a70..b1910a6959 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -2,6 +2,7 @@ load("@rules_cc//cc/common:cc_common.bzl", "cc_common") load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") +load("//python:versions.bzl", "PLATFORMS") load("//python/private:attr_builders.bzl", "attrb") load("//python/private:attributes.bzl", "COMMON_ATTRS") load("//python/private:py_info.bzl", "PyInfo") @@ -65,7 +66,7 @@ def _py_extension_impl(ctx): else: py_toolchain = ctx.toolchains[TARGET_TOOLCHAIN_TYPE] py_runtime = py_toolchain.py3_runtime - platform_tag = _get_platform(cc_toolchain) + platform_tag = _get_platform(ctx, cc_toolchain) output_filename = "{module_name}.{pyc_tag}{abi_flags}-{platform}.{ext}".format( module_name = module_name, pyc_tag = py_runtime.pyc_tag, # e.g. "cpython-311" @@ -185,6 +186,20 @@ extension. """, default = "none" ), + "_constraints": lambda: attrb.LabelList( + default = [ + "@platforms//os:linux", + "@platforms//os:macos", + "@platforms//os:windows", + "@platforms//cpu:x86_64", + "@platforms//cpu:aarch64", + "@platforms//cpu:armv7", + "@platforms//cpu:i386", + "@platforms//cpu:ppc", + "@platforms//cpu:riscv64", + "@platforms//cpu:s390x", + ], + ), } def create_py_extension_rule_builder(**kwargs): @@ -236,16 +251,70 @@ def _get_extension(cc_toolchain): ext = "pyd" if is_windows else "so" return ext -def _get_platform(cc_toolchain): - """Derives the PEP 3149 platform tag from the C++ toolchain. +def _derive_pep3149_tag(platform, info): + # platform is the triplet, e.g. "x86_64-unknown-linux-gnu" + p, _, _ = platform.partition("-freethreaded") + parts = p.split("-") + triplet_arch = parts[0] + + if info.os_name == "windows": + if triplet_arch == "x86_64": + return "win_amd64" + elif triplet_arch == "aarch64": + return "win_arm64" + else: + return "win32" + elif info.os_name == "osx": + return "darwin" + elif info.os_name == "linux": + abi = "musl" if p.endswith("-musl") else "gnu" + return "{}-linux-{}".format(triplet_arch, abi) + else: + return triplet_arch + +def _get_platform_from_constraints(ctx): + # Build a map of Label to ConstraintValueInfo from _constraints + constraints_map = {} + for c in ctx.attr._constraints: + if platform_common.ConstraintValueInfo in c: + constraints_map[c.label] = c[platform_common.ConstraintValueInfo] + + # Find the matching platform in PLATFORMS + for platform, info in PLATFORMS.items(): + # Check if all compatible_with constraints are satisfied + match = True + for c_str in info.compatible_with: + c_label = Label(c_str) + if c_label in constraints_map: + c_val = constraints_map[c_label] + if not ctx.target_platform_has_constraint(c_val): + match = False + break + else: + match = False + break + if match: + return _derive_pep3149_tag(platform, info) + + return None + +def _get_platform(ctx, cc_toolchain): + """Derives the PEP 3149 platform tag from the C++ toolchain or target constraints. Args: + ctx: The rule context. cc_toolchain: The CcToolchainInfo provider (usually obtained via ctx.toolchains["@bazel_tools//tools/cpp:toolchain_type"].cc) Returns: The platform tag, e.g. "x86_64-linux-gnu" or "win_amd64" """ + # Try to resolve using modern platform constraints and PLATFORMS + platform_tag = _get_platform_from_constraints(ctx) + if platform_tag: + return platform_tag + + # Fallback to legacy cc_toolchain parsing # Get the GNU target name (e.g., "local-linux-gnu" or "x86_64-unknown-linux-gnu") target_name = cc_toolchain.target_gnu_system_name From 590b66716f1d9477e9dfd6a65e6a56e3f4af20a1 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Mon, 29 Jun 2026 21:14:43 +0000 Subject: [PATCH 08/42] Adjust formatting syntax. --- python/private/cc/py_extension_rule.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index b1910a6959..f31904354f 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -379,7 +379,7 @@ def _version_to_hex(version_str): # Format the minor version as a 2-digit hex (e.g., 10 -> "0a") # Starlark doesn't seem to support %02x formatting - return "0x03%x%x0000" % (int(minor/16), minor%16) + return "0x03%x%x0000" % (minor//16, minor%16) def _check_limited_api_compatibility(ctx, ext_version_str): From 15c95f868a4baba5c14ca06e53d002e21801bc2e Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Mon, 29 Jun 2026 21:22:43 +0000 Subject: [PATCH 09/42] Change the default value. --- python/private/cc/py_extension_rule.bzl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index f31904354f..a4c695831a 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -54,7 +54,7 @@ def _py_extension_impl(ctx): user_link_flags.append("-Wl,--allow-shlib-undefined") ext = _get_extension(cc_toolchain) - use_py_limited_api = ctx.attr.py_limited_api and ctx.attr.py_limited_api != "none" + use_py_limited_api = bool(ctx.attr.py_limited_api) if use_py_limited_api: # check that all dependencies have compatible API versions, if defined _check_limited_api_compatibility(ctx, ctx.attr.py_limited_api) @@ -163,7 +163,7 @@ PY_EXTENSION_ATTRS = COMMON_ATTRS | { doc = """ The minimum Python version to target for the Limited API (e.g., '3.8'). -If set to a version string (e.g., '3.8') instead of 'none': +If set to a version string (e.g., '3.8') instead of '' (empty string): - Configures the output filename to use the simple '.abi3' suffix (e.g., 'ext.abi3.so'). - Strictly validates that all linked C++ dependencies (static_deps, @@ -181,10 +181,10 @@ that compile your C/C++ sources, for example: ... ) -Set to 'none' (the default) to build a standard, version-specific +Set to '' (the default) or None to build a standard, version-specific extension. """, - default = "none" + default = "" ), "_constraints": lambda: attrb.LabelList( default = [ @@ -384,7 +384,7 @@ def _version_to_hex(version_str): def _check_limited_api_compatibility(ctx, ext_version_str): """Validates that all C++ dependencies are binary-compatible with the extension's Limited API target.""" - if ext_version_str == "none": + if not ext_version_str: return ext_version_hex = _version_to_hex(ext_version_str) From daa24558227bf86edf3b8c4f3138324de60cf334 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Mon, 29 Jun 2026 21:25:35 +0000 Subject: [PATCH 10/42] Add more test cases for py_limited_api. --- .../cc/py_extension/py_limited_api_tests.bzl | 222 +++++++++++++++--- 1 file changed, 195 insertions(+), 27 deletions(-) diff --git a/tests/cc/py_extension/py_limited_api_tests.bzl b/tests/cc/py_extension/py_limited_api_tests.bzl index 5df7892535..895a38a318 100644 --- a/tests/cc/py_extension/py_limited_api_tests.bzl +++ b/tests/cc/py_extension/py_limited_api_tests.bzl @@ -20,13 +20,16 @@ load("@rules_testing//lib:util.bzl", "util") load("//python/cc:py_extension.bzl", "py_extension") load("@rules_cc//cc:cc_library.bzl", "cc_library") +def _test_limited_pass_impl(env, target): + env.expect.that_target(target).default_outputs().contains( + "tests/cc/py_extension/{}.abi3.so".format(target.label.name) + ) def _test_limited_same_version(name): - # given util.helper_target( cc_library, name = name + '_csl', - defines = ["Py_LIMITED_API=0x3080000"], + defines = ["Py_LIMITED_API=0x03080000"], deps = [ "@rules_python//python/cc:current_py_cc_headers", ], @@ -36,42 +39,207 @@ def _test_limited_same_version(name): static_deps = [':' + name + '_csl'], py_limited_api = '3.8', ) + analysis_test( + name = name, + target = name + "_pyext", + impl = _test_limited_pass_impl, + ) - # when +def _test_limited_older_dep(name): + util.helper_target( + cc_library, + name = name + '_csl', + defines = ["Py_LIMITED_API=0x03080000"], # 3.8 + deps = [ + "@rules_python//python/cc:current_py_cc_headers", + ], + ) + py_extension( + name = name + '_pyext', + static_deps = [':' + name + '_csl'], + py_limited_api = '3.9', # 3.9 + ) analysis_test( name = name, target = name + "_pyext", - impl=_test_limited_same_version_impl) + impl = _test_limited_pass_impl, + ) -def _test_limited_same_version_impl(env, target): - # then - env.expect.that_target(target).default_outputs().contains( - "tests/cc/py_extension/test_limited_same_version_pyext.abi3.so" - ) - -# test cases: -# py_limited_api -# - 3.8 -> 3.9 -# - 3.9 -> 3.8 -# - 3.9 -> 3.9 ok -# - none -> 3.8 -# - 3.8 -> none fail -# - 3.8 -> nopy ok -# - none -> none ok? -# - none -> nopy ok? -# invalid values for version string -# - 2.x -# - 3.0 and 3.1 -# - 4.x -# - not version string, e.g. "asdf" -# - patch versions? 3.8.4 ? -# - empty string or null? +def _test_limited_newer_dep(name): + util.helper_target( + cc_library, + name = name + '_csl', + defines = ["Py_LIMITED_API=0x03090000"], # 3.9 + deps = [ + "@rules_python//python/cc:current_py_cc_headers", + ], + ) + py_extension( + name = name + '_pyext', + static_deps = [':' + name + '_csl'], + py_limited_api = '3.8', # 3.8 + ) + analysis_test( + name = name, + target = name + "_pyext", + impl = _test_limited_newer_dep_impl, + expect_failure = True, + ) + +def _test_limited_newer_dep_impl(env, target): + env.expect.that_target(target).failures().contains_predicate( + matching.str_matches("*Incompatible Python Limited API targets detected*"), + ) + +def _test_limited_dep_missing_define(name): + util.helper_target( + cc_library, + name = name + '_csl', + deps = [ + "@rules_python//python/cc:current_py_cc_headers", + ], + ) + py_extension( + name = name + '_pyext', + static_deps = [':' + name + '_csl'], + py_limited_api = '3.8', + ) + analysis_test( + name = name, + target = name + "_pyext", + impl = _test_limited_dep_missing_define_impl, + expect_failure = True, + ) +def _test_limited_dep_missing_define_impl(env, target): + env.expect.that_target(target).failures().contains_predicate( + matching.str_matches("*Unsafe Python C API usage in dependency*"), + ) + +def _test_limited_dep_unspecified_define(name): + util.helper_target( + cc_library, + name = name + '_csl', + defines = ["Py_LIMITED_API"], + deps = [ + "@rules_python//python/cc:current_py_cc_headers", + ], + ) + py_extension( + name = name + '_pyext', + static_deps = [':' + name + '_csl'], + py_limited_api = '3.8', + ) + analysis_test( + name = name, + target = name + "_pyext", + impl = _test_limited_dep_unspecified_define_impl, + expect_failure = True, + ) + +def _test_limited_dep_unspecified_define_impl(env, target): + env.expect.that_target(target).failures().contains_predicate( + matching.str_matches("*Unsafe Python Limited API definition in dependency*"), + ) + +def _test_no_limited_api(name): + util.helper_target( + cc_library, + name = name + '_csl', + deps = [ + "@rules_python//python/cc:current_py_cc_headers", + ], + ) + py_extension( + name = name + '_pyext', + static_deps = [':' + name + '_csl'], + ) + analysis_test( + name = name, + target = name + "_pyext", + impl = _test_no_limited_api_impl, + ) + +def _test_no_limited_api_impl(env, target): + # Should pass, nothing to assert on filename since it is platform-specific + pass + +def _test_no_limited_api_dep_has_limited(name): + util.helper_target( + cc_library, + name = name + '_csl', + defines = ["Py_LIMITED_API=0x03080000"], + deps = [ + "@rules_python//python/cc:current_py_cc_headers", + ], + ) + py_extension( + name = name + '_pyext', + static_deps = [':' + name + '_csl'], + ) + analysis_test( + name = name, + target = name + "_pyext", + impl = _test_no_limited_api_dep_has_limited_impl, + ) + +def _test_no_limited_api_dep_has_limited_impl(env, target): + pass + +def _test_limited_api_dep_has_no_python(name): + util.helper_target( + cc_library, + name = name + '_csl', + ) + py_extension( + name = name + '_pyext', + static_deps = [':' + name + '_csl'], + py_limited_api = '3.8', + ) + analysis_test( + name = name, + target = name + "_pyext", + impl = _test_limited_pass_impl, + ) + +def _test_invalid_version_format(name): + util.helper_target( + cc_library, + name = name + '_csl', + defines = ["Py_LIMITED_API=0x03080000"], + deps = [ + "@rules_python//python/cc:current_py_cc_headers", + ], + ) + py_extension( + name = name + '_pyext', + static_deps = [':' + name + '_csl'], + py_limited_api = '3.8.1', + ) + analysis_test( + name = name, + target = name + "_pyext", + impl = _test_invalid_version_format_impl, + expect_failure = True, + ) + +def _test_invalid_version_format_impl(env, target): + env.expect.that_target(target).failures().contains_predicate( + matching.str_matches("*Invalid py_limited_api version*"), + ) def py_limited_api_test_suite(name): test_suite( name = name, tests = [ _test_limited_same_version, + _test_limited_older_dep, + _test_limited_newer_dep, + _test_limited_dep_missing_define, + _test_limited_dep_unspecified_define, + _test_no_limited_api, + _test_no_limited_api_dep_has_limited, + _test_limited_api_dep_has_no_python, + _test_invalid_version_format, ], ) From 030c87952d1dd26d4f7f64e129f94d9cea4f75f7 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Mon, 29 Jun 2026 22:18:29 +0000 Subject: [PATCH 11/42] Use RunfilesBuilder instead of manual. --- python/private/cc/py_extension_rule.bzl | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index a4c695831a..674d994b6b 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -5,6 +5,7 @@ load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") load("//python:versions.bzl", "PLATFORMS") load("//python/private:attr_builders.bzl", "attrb") load("//python/private:attributes.bzl", "COMMON_ATTRS") +load("//python/private:builders.bzl", "builders") load("//python/private:py_info.bzl", "PyInfo") load("//python/private:py_internal.bzl", "py_internal") load("//python/private:reexports.bzl", "BuiltinPyInfo") @@ -120,11 +121,12 @@ def _py_extension_impl(ctx): cc_infos = [dynamic_cc_info] + external_deps_infos, ) - runfiles = ctx.runfiles(files = [py_dso]) - transitive_runfiles = [] - for dep in ctx.attr.static_deps + ctx.attr.dynamic_deps + ctx.attr.external_deps: - transitive_runfiles.append(dep[DefaultInfo].default_runfiles) - runfiles = runfiles.merge_all(transitive_runfiles) + runfiles_builder = builders.RunfilesBuilder() + runfiles_builder.add(py_dso) + runfiles_builder.add_targets(ctx.attr.static_deps) + runfiles_builder.add_targets(ctx.attr.dynamic_deps) + runfiles_builder.add_targets(ctx.attr.external_deps) + runfiles = runfiles_builder.build(ctx) return [ DefaultInfo( From 73eb7c0952899d9dbdb603eb2219afd17e933296 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 01:15:25 +0000 Subject: [PATCH 12/42] Add abi_tag to PyCcToolchainInfo. --- python/private/py_cc_toolchain_info.bzl | 5 +++++ python/private/py_cc_toolchain_rule.bzl | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/python/private/py_cc_toolchain_info.bzl b/python/private/py_cc_toolchain_info.bzl index 8cb3680b59..da7938503f 100644 --- a/python/private/py_cc_toolchain_info.bzl +++ b/python/private/py_cc_toolchain_info.bzl @@ -17,6 +17,11 @@ PyCcToolchainInfo = provider( doc = "C/C++ information about the Python runtime.", fields = { + "abi_tag": """\ +:type: str + +The ABI tag for extension modules, e.g. 'cpython-311' or 'cpython-313t'. +""", "headers": """\ :type: struct diff --git a/python/private/py_cc_toolchain_rule.bzl b/python/private/py_cc_toolchain_rule.bzl index b5c997ea6e..4067df668d 100644 --- a/python/private/py_cc_toolchain_rule.bzl +++ b/python/private/py_cc_toolchain_rule.bzl @@ -45,7 +45,14 @@ def _py_cc_toolchain_impl(ctx): else: headers_abi3 = None + abi_tag = ctx.attr.abi_tag + if not abi_tag: + # Derive default: cpython-XX + version_parts = ctx.attr.python_version.split(".") + abi_tag = "cpython-{}{}".format(version_parts[0], version_parts[1]) + py_cc_toolchain = PyCcToolchainInfo( + abi_tag = abi_tag, headers = struct( providers_map = { "CcInfo": ctx.attr.headers[CcInfo], @@ -67,6 +74,10 @@ def _py_cc_toolchain_impl(ctx): py_cc_toolchain = rule( implementation = _py_cc_toolchain_impl, attrs = { + "abi_tag": attr.string( + doc = "The ABI tag for extension modules, e.g. 'cpython-311'", + default = "", + ), "headers": attr.label( doc = ("Target that provides the Python headers. Typically this " + "is a cc_library target."), From 5cb7c9072b8a2383cabb63e58b7784d2d5dba2b9 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 01:15:53 +0000 Subject: [PATCH 13/42] Use the PyCcToolchainInfo to derive the filename instead of the runtime toolchain. --- python/private/cc/py_extension_rule.bzl | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 674d994b6b..2f71799e3c 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -10,7 +10,7 @@ load("//python/private:py_info.bzl", "PyInfo") load("//python/private:py_internal.bzl", "py_internal") load("//python/private:reexports.bzl", "BuiltinPyInfo") load("//python/private:rule_builders.bzl", "ruleb") -load("//python/private:toolchain_types.bzl", "TARGET_TOOLCHAIN_TYPE") +load("//python/private:toolchain_types.bzl", "PY_CC_TOOLCHAIN_TYPE") def _py_extension_impl(ctx): module_name = ctx.attr.module_name or ctx.label.name @@ -65,15 +65,14 @@ def _py_extension_impl(ctx): ext=ext, ) else: - py_toolchain = ctx.toolchains[TARGET_TOOLCHAIN_TYPE] - py_runtime = py_toolchain.py3_runtime + py_toolchain = ctx.toolchains[PY_CC_TOOLCHAIN_TYPE] + py_cc_toolchain = py_toolchain.py_cc_toolchain platform_tag = _get_platform(ctx, cc_toolchain) - output_filename = "{module_name}.{pyc_tag}{abi_flags}-{platform}.{ext}".format( + output_filename = "{module_name}.{abi_tag}-{platform}.{ext}".format( module_name = module_name, - pyc_tag = py_runtime.pyc_tag, # e.g. "cpython-311" - abi_flags = py_runtime.abi_flags, # e.g. "" or "d" - platform = platform_tag, # e.g. "x86_64-linux-gnu" - ext = "so", + abi_tag = py_cc_toolchain.abi_tag, + platform = platform_tag, + ext = ext, ) py_dso = ctx.actions.declare_file(output_filename) @@ -211,7 +210,7 @@ def create_py_extension_rule_builder(**kwargs): attrs = PY_EXTENSION_ATTRS, provides = [PyInfo, CcInfo], toolchains = [ - ruleb.ToolchainType(TARGET_TOOLCHAIN_TYPE), + ruleb.ToolchainType(PY_CC_TOOLCHAIN_TYPE), ruleb.ToolchainType("@bazel_tools//tools/cpp:toolchain_type"), ], fragments = ["cpp"], From 797bf98e9ecc045ebbe499d1239acaf9582d50f3 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 03:46:05 +0000 Subject: [PATCH 14/42] Remove the fallback. Determine platform tag solely from constraints. --- python/private/cc/py_extension_rule.bzl | 77 ++++--------------------- 1 file changed, 12 insertions(+), 65 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 2f71799e3c..409640b8ad 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -67,7 +67,7 @@ def _py_extension_impl(ctx): else: py_toolchain = ctx.toolchains[PY_CC_TOOLCHAIN_TYPE] py_cc_toolchain = py_toolchain.py_cc_toolchain - platform_tag = _get_platform(ctx, cc_toolchain) + platform_tag = _get_platform(ctx) output_filename = "{module_name}.{abi_tag}-{platform}.{ext}".format( module_name = module_name, abi_tag = py_cc_toolchain.abi_tag, @@ -220,19 +220,6 @@ def create_py_extension_rule_builder(**kwargs): py_extension = create_py_extension_rule_builder().build() -# Map Bazel's internal CPU names to PEP 3149 standard architecture names -_BAZEL_CPU_TO_PEP_ARCH = { - "k8": "x86_64", - "amd64": "x86_64", - "x86_64": "x86_64", - "aarch64": "aarch64", - "arm64": "arm64", - "darwin": "x86_64", # Historical Bazel Mac CPU - "darwin_x86_64": "x86_64", - "darwin_arm64": "arm64", - "x64_windows": "x86_64", - "arm64_windows": "arm64", -} def _get_extension(cc_toolchain): """ @@ -299,68 +286,28 @@ def _get_platform_from_constraints(ctx): return None -def _get_platform(ctx, cc_toolchain): - """Derives the PEP 3149 platform tag from the C++ toolchain or target constraints. +def _get_platform(ctx): + """Derives the PEP 3149 platform tag from the target constraints. Args: ctx: The rule context. - cc_toolchain: The CcToolchainInfo provider (usually obtained via - ctx.toolchains["@bazel_tools//tools/cpp:toolchain_type"].cc) Returns: The platform tag, e.g. "x86_64-linux-gnu" or "win_amd64" """ - # Try to resolve using modern platform constraints and PLATFORMS platform_tag = _get_platform_from_constraints(ctx) if platform_tag: return platform_tag - # Fallback to legacy cc_toolchain parsing - # Get the GNU target name (e.g., "local-linux-gnu" or "x86_64-unknown-linux-gnu") - target_name = cc_toolchain.target_gnu_system_name - - # Detect the OS family - is_windows = "windows" in target_name or "mingw" in target_name or "msvc" in target_name - is_mac = "apple" in target_name or "darwin" in target_name - - # Parse the architecture from the target_name - # e.g., "x86_64-unknown-linux-gnu" -> "x86_64" - target_parts = target_name.split("-") - arch = target_parts[0] - - # Handle the "local" placeholder by falling back to cc_toolchain.cpu - if arch == "local": - cpu = cc_toolchain.cpu - # Resolve the Bazel CPU name to a standard PEP architecture - arch = _BAZEL_CPU_TO_PEP_ARCH.get(cpu, cpu) - # Normalize standard names if they came from a full target_name - elif arch == "amd64": - arch = "x86_64" - elif arch == "aarch64": - arch = "arm64" if is_mac else "aarch64" - - # Derive the PEP 3149 / PEP 425 platform tag - if is_windows: - platform_tag = "win_amd64" if arch == "x86_64" else "win32" - elif is_mac: - platform_tag = "darwin" - else: - # Linux/Unix: Reconstruct the triplet, dropping the vendor if present - os_part = "linux" - abi_part = "gnu" - - if len(target_parts) == 4: - # [arch, vendor, os, abi] - os_part = target_parts[2] - abi_part = target_parts[3] - elif len(target_parts) == 3: - # [arch, os, abi] - os_part = target_parts[1] - abi_part = target_parts[2] - - platform_tag = "{}-{}-{}".format(arch, os_part, abi_part) - - return platform_tag + fail( + """ +ERROR: Unsupported target platform for {self}. + The target platform's constraints do not match any supported platform + in rules_python's central registry (python/versions.bzl). + Please ensure your target platform is configured correctly.""".format( + self = ctx.label, + ) + ) def _version_to_hex(version_str): From 09a2e0a559b01b9b083d41fd39157bc4afd2077c Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 04:01:51 +0000 Subject: [PATCH 15/42] Remove the version compatibility check, as it has performance implications and may produce false-positives. --- python/private/cc/py_extension_rule.bzl | 106 ----------------- .../cc/py_extension/py_limited_api_tests.bzl | 107 ------------------ 2 files changed, 213 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 409640b8ad..54a8404d67 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -57,9 +57,6 @@ def _py_extension_impl(ctx): ext = _get_extension(cc_toolchain) use_py_limited_api = bool(ctx.attr.py_limited_api) if use_py_limited_api: - # check that all dependencies have compatible API versions, if defined - _check_limited_api_compatibility(ctx, ctx.attr.py_limited_api) - output_filename = "{module_name}.abi3.{ext}".format( module_name=module_name, ext=ext, @@ -308,106 +305,3 @@ ERROR: Unsupported target platform for {self}. self = ctx.label, ) ) - - -def _version_to_hex(version_str): - """Converts a version string like '3.10' to Python's version hex '0x030a0000'.""" - parts = version_str.split(".") - if len(parts) != 2: - fail("Invalid py_limited_api version '{}', expected 'major.minor' format (e.g., '3.8')".format(version_str)) - - major = int(parts[0]) - minor = int(parts[1]) - - if major != 3: - fail("Python Limited API is only supported for Python 3.2+ (got Python {})".format(major)) - if minor < 2: - fail("Python Limited API is only supported for Python 3.2+ (got 3.{})".format(minor)) - - # Format the minor version as a 2-digit hex (e.g., 10 -> "0a") - # Starlark doesn't seem to support %02x formatting - - return "0x03%x%x0000" % (minor//16, minor%16) - - -def _check_limited_api_compatibility(ctx, ext_version_str): - """Validates that all C++ dependencies are binary-compatible with the extension's Limited API target.""" - if not ext_version_str: - return - - ext_version_hex = _version_to_hex(ext_version_str) - ext_version_val = int(ext_version_hex, 16) - - # Collect all dependencies that might propagate CcInfo - deps = [] - deps.extend(ctx.attr.static_deps) - deps.extend(ctx.attr.dynamic_deps) - deps.extend(ctx.attr.external_deps) - - for dep in deps: - if CcInfo not in dep: - continue - - comp_ctx = dep[CcInfo].compilation_context - - # Detect if the dependency has access to Python headers - has_python_headers = False - for header in comp_ctx.headers.to_list(): - if header.basename == "Python.h": - has_python_headers = True - break - - # Inspect the propagated defines - has_limited_api_define = False - limited_api_define_value = None - - for define in comp_ctx.defines.to_list(): - if define.startswith("Py_LIMITED_API="): - has_limited_api_define = True - limited_api_define_value = define.split("=")[1] - elif define == "Py_LIMITED_API": - has_limited_api_define = True - limited_api_define_value = "unspecified" - - # Enforce the compatibility contract - - # Contract Rule A: If the library uses Python, it MUST use the Limited API - if has_python_headers and not has_limited_api_define: - fail(( - "\nERROR: Unsafe Python C API usage in dependency:\n" + - " Dependency '{dep}' includes Python headers (contains 'Python.h')\n" + - " but does NOT define 'Py_LIMITED_API'.\n" + - " This will link unstable Python symbols into your Stable ABI extension.\n" + - " Please add: defines = [\"Py_LIMITED_API={ext_hex}\"] to '{dep}'." - ).format( - dep = dep.label, - ext_hex = ext_version_hex, - )) - - # Contract Rule B: If the Limited API is defined, it must be version-safe - if has_limited_api_define: - if limited_api_define_value == "unspecified": - fail(( - "\nERROR: Unsafe Python Limited API definition in dependency\n" + - " Dependency '{dep}' defines 'Py_LIMITED_API' without a version hex.\n" + - " Please change it to specify the target version explicitly, " + - "for example: defines = [\"Py_LIMITED_API={ext_hex}\"]" - ).format( - dep = dep.label, - ext_hex = ext_version_hex, - )) - else: - dep_version_val = int(limited_api_define_value.rstrip("ULul"), 16) - if dep_version_val > ext_version_val: - fail(( - "\nERROR: Incompatible Python Limited API targets detected\n" + - " Extension '{self}' targets version '{ext_ver}' ({ext_hex}).\n" + - " Dependency '{dep}' targets a NEWER version ({dep_hex}).\n" + - " You cannot link a newer Limited API library into an older extension." - ).format( - self = ctx.label, - ext_ver = ext_version_str, - ext_hex = ext_version_hex, - dep = dep.label, - dep_hex = limited_api_define_value, - )) diff --git a/tests/cc/py_extension/py_limited_api_tests.bzl b/tests/cc/py_extension/py_limited_api_tests.bzl index 895a38a318..5e344dbc31 100644 --- a/tests/cc/py_extension/py_limited_api_tests.bzl +++ b/tests/cc/py_extension/py_limited_api_tests.bzl @@ -65,83 +65,6 @@ def _test_limited_older_dep(name): impl = _test_limited_pass_impl, ) -def _test_limited_newer_dep(name): - util.helper_target( - cc_library, - name = name + '_csl', - defines = ["Py_LIMITED_API=0x03090000"], # 3.9 - deps = [ - "@rules_python//python/cc:current_py_cc_headers", - ], - ) - py_extension( - name = name + '_pyext', - static_deps = [':' + name + '_csl'], - py_limited_api = '3.8', # 3.8 - ) - analysis_test( - name = name, - target = name + "_pyext", - impl = _test_limited_newer_dep_impl, - expect_failure = True, - ) - -def _test_limited_newer_dep_impl(env, target): - env.expect.that_target(target).failures().contains_predicate( - matching.str_matches("*Incompatible Python Limited API targets detected*"), - ) - -def _test_limited_dep_missing_define(name): - util.helper_target( - cc_library, - name = name + '_csl', - deps = [ - "@rules_python//python/cc:current_py_cc_headers", - ], - ) - py_extension( - name = name + '_pyext', - static_deps = [':' + name + '_csl'], - py_limited_api = '3.8', - ) - analysis_test( - name = name, - target = name + "_pyext", - impl = _test_limited_dep_missing_define_impl, - expect_failure = True, - ) - -def _test_limited_dep_missing_define_impl(env, target): - env.expect.that_target(target).failures().contains_predicate( - matching.str_matches("*Unsafe Python C API usage in dependency*"), - ) - -def _test_limited_dep_unspecified_define(name): - util.helper_target( - cc_library, - name = name + '_csl', - defines = ["Py_LIMITED_API"], - deps = [ - "@rules_python//python/cc:current_py_cc_headers", - ], - ) - py_extension( - name = name + '_pyext', - static_deps = [':' + name + '_csl'], - py_limited_api = '3.8', - ) - analysis_test( - name = name, - target = name + "_pyext", - impl = _test_limited_dep_unspecified_define_impl, - expect_failure = True, - ) - -def _test_limited_dep_unspecified_define_impl(env, target): - env.expect.that_target(target).failures().contains_predicate( - matching.str_matches("*Unsafe Python Limited API definition in dependency*"), - ) - def _test_no_limited_api(name): util.helper_target( cc_library, @@ -202,44 +125,14 @@ def _test_limited_api_dep_has_no_python(name): impl = _test_limited_pass_impl, ) -def _test_invalid_version_format(name): - util.helper_target( - cc_library, - name = name + '_csl', - defines = ["Py_LIMITED_API=0x03080000"], - deps = [ - "@rules_python//python/cc:current_py_cc_headers", - ], - ) - py_extension( - name = name + '_pyext', - static_deps = [':' + name + '_csl'], - py_limited_api = '3.8.1', - ) - analysis_test( - name = name, - target = name + "_pyext", - impl = _test_invalid_version_format_impl, - expect_failure = True, - ) - -def _test_invalid_version_format_impl(env, target): - env.expect.that_target(target).failures().contains_predicate( - matching.str_matches("*Invalid py_limited_api version*"), - ) - def py_limited_api_test_suite(name): test_suite( name = name, tests = [ _test_limited_same_version, _test_limited_older_dep, - _test_limited_newer_dep, - _test_limited_dep_missing_define, - _test_limited_dep_unspecified_define, _test_no_limited_api, _test_no_limited_api_dep_has_limited, _test_limited_api_dep_has_no_python, - _test_invalid_version_format, ], ) From 5bbe09ff6e8f1fc957c0cabb01d6afb43b92fca3 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 15:58:50 +0000 Subject: [PATCH 16/42] Fix header filename. --- tests/cc/py_extension/static_dep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cc/py_extension/static_dep.c b/tests/cc/py_extension/static_dep.c index 4d910c1178..fa95e4dacc 100644 --- a/tests/cc/py_extension/static_dep.c +++ b/tests/cc/py_extension/static_dep.c @@ -1,4 +1,4 @@ -#include "my_lib.h" +#include "static_dep.h" int my_lib_func() { return 42; From 475ed3d263fa8d3fd6b8cd0352d0c5bbad24ba6a Mon Sep 17 00:00:00 2001 From: rsartor-cmd Date: Tue, 30 Jun 2026 11:29:18 -0500 Subject: [PATCH 17/42] Update python/private/cc/py_extension_rule.bzl Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- python/private/cc/py_extension_rule.bzl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 54a8404d67..0f73574132 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -164,10 +164,6 @@ The minimum Python version to target for the Limited API (e.g., '3.8'). If set to a version string (e.g., '3.8') instead of '' (empty string): - Configures the output filename to use the simple '.abi3' suffix (e.g., 'ext.abi3.so'). - - Strictly validates that all linked C++ dependencies (static_deps, - dynamic_deps, etc.) are binary-compatible with this target version, - failing the build if a dependency is missing the 'Py_LIMITED_API' - define or targets a newer version. Note: Since the py_extension rule only links pre-compiled libraries, you must manually add the preprocessor macro to the cc_library targets From 903c96a60aa7e97b0365ed76fc818b72e596893f Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 16:05:10 +0000 Subject: [PATCH 18/42] ruff --- tests/cc/py_extension/py_extension_test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/cc/py_extension/py_extension_test.py b/tests/cc/py_extension/py_extension_test.py index 3d71e453fd..52d5502ea7 100644 --- a/tests/cc/py_extension/py_extension_test.py +++ b/tests/cc/py_extension/py_extension_test.py @@ -11,7 +11,10 @@ class PyExtensionTest(unittest.TestCase): def test_inspect_elf(self): r = runfiles.Create() - ext_path = r.Rlocation("rules_python/tests/cc/py_extension/ext_shared.cpython-311-x86_64-linux-gnu.so") + ext_path = r.Rlocation( + "rules_python/tests/cc/py_extension/" + + "ext_shared.cpython-311-x86_64-linux-gnu.so" + ) self.assertTrue( os.path.exists(ext_path), f"Could not find ext_shared.so at {ext_path}" ) From 9570a985a02a2515355bbeff3d3695b6314b4be2 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 16:28:44 +0000 Subject: [PATCH 19/42] Derive the values for the _constraints attr programmatically, instead of hard-coding. --- python/private/cc/py_extension_rule.bzl | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 0f73574132..23fd0ce627 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -181,18 +181,11 @@ extension. default = "" ), "_constraints": lambda: attrb.LabelList( - default = [ - "@platforms//os:linux", - "@platforms//os:macos", - "@platforms//os:windows", - "@platforms//cpu:x86_64", - "@platforms//cpu:aarch64", - "@platforms//cpu:armv7", - "@platforms//cpu:i386", - "@platforms//cpu:ppc", - "@platforms//cpu:riscv64", - "@platforms//cpu:s390x", - ], + default = sorted({ + c: None + for info in PLATFORMS.values() + for c in info.compatible_with + }.keys()), ), } From 7179c8a991b871f9b3415a08d79fe0fa0c34f252 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 16:45:47 +0000 Subject: [PATCH 20/42] Take glibc-vs-musl into account, so we get the right platform and name. --- python/private/cc/py_extension_macro.bzl | 6 ++++++ python/private/cc/py_extension_rule.bzl | 15 +++++++++++++++ tests/cc/py_extension/py_extension_tests.bzl | 19 +++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/python/private/cc/py_extension_macro.bzl b/python/private/cc/py_extension_macro.bzl index 8c4cc36f58..7b052de0a8 100644 --- a/python/private/cc/py_extension_macro.bzl +++ b/python/private/cc/py_extension_macro.bzl @@ -20,6 +20,12 @@ def py_extension(**kwargs): if use_csl: _py_extension_csl(**kwargs) else: + if "libc" not in kwargs: + kwargs["libc"] = select({ + "@rules_python//python/config_settings:_is_py_linux_libc_musl": "musl", + "@rules_python//python/config_settings:_is_py_linux_libc_glibc": "glibc", + "//conditions:default": "glibc", + }) _py_extension(**kwargs) def _py_extension_csl(*, name, module_name = None, **kwargs): diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 23fd0ce627..7592f28088 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -155,6 +155,7 @@ PY_EXTENSION_ATTRS = COMMON_ATTRS | { default = [], ), "copts": lambda: attrb.StringList(), + "libc": lambda: attrb.String(default = "glibc"), "linkopts": lambda: attrb.StringList(), "module_name": lambda: attrb.String(), "py_limited_api": lambda: attrb.String( @@ -253,6 +254,13 @@ def _get_platform_from_constraints(ctx): if platform_common.ConstraintValueInfo in c: constraints_map[c.label] = c[platform_common.ConstraintValueInfo] + # Resolve the target's libc to its config_setting label string + target_libc_setting = None + if ctx.attr.libc == "musl": + target_libc_setting = str(Label("//python/config_settings:_is_py_linux_libc_musl")) + elif ctx.attr.libc == "glibc": + target_libc_setting = str(Label("//python/config_settings:_is_py_linux_libc_glibc")) + # Find the matching platform in PLATFORMS for platform, info in PLATFORMS.items(): # Check if all compatible_with constraints are satisfied @@ -267,6 +275,13 @@ def _get_platform_from_constraints(ctx): else: match = False break + + if match: + # Additional check for Linux libc consistency using target_settings + if info.os_name == "linux" and target_libc_setting: + if target_libc_setting not in info.target_settings: + match = False + if match: return _derive_pep3149_tag(platform, info) diff --git a/tests/cc/py_extension/py_extension_tests.bzl b/tests/cc/py_extension/py_extension_tests.bzl index 514bb22ac4..8235e8cd0f 100644 --- a/tests/cc/py_extension/py_extension_tests.bzl +++ b/tests/cc/py_extension/py_extension_tests.bzl @@ -70,6 +70,25 @@ def _test_dynamic_deps(name): _tests.append(_test_dynamic_deps) +def _test_musl_platform_impl(env, target): + env.expect.that_target(target).has_provider(PyInfo) + py_info = target[PyInfo] + env.expect.that_depset_of_files(py_info.transitive_sources).contains_predicate( + matching.file_basename_equals("ext_static.cpython-311-x86_64-linux-musl.so"), + ) + +def _test_musl_platform(name): + analysis_test( + name = name, + impl = _test_musl_platform_impl, + target = "//tests/cc/py_extension:ext_static", + config_settings = { + str(Label("//python/config_settings:py_linux_libc")): "musl", + }, + ) + +_tests.append(_test_musl_platform) + def py_extension_analysis_test_suite(name): test_suite( name = name, From b353be69bbe655b18fee9945d36d8831626554f2 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 16:55:17 +0000 Subject: [PATCH 21/42] Clean up as per the linter. --- python/private/cc/py_extension_rule.bzl | 9 ++-- tests/cc/py_extension/BUILD.bazel | 4 +- .../cc/py_extension/py_limited_api_tests.bzl | 42 +++++++++---------- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 7592f28088..f7ec72fe6f 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -58,8 +58,8 @@ def _py_extension_impl(ctx): use_py_limited_api = bool(ctx.attr.py_limited_api) if use_py_limited_api: output_filename = "{module_name}.abi3.{ext}".format( - module_name=module_name, - ext=ext, + module_name = module_name, + ext = ext, ) else: py_toolchain = ctx.toolchains[PY_CC_TOOLCHAIN_TYPE] @@ -179,7 +179,7 @@ that compile your C/C++ sources, for example: Set to '' (the default) or None to build a standard, version-specific extension. """, - default = "" + default = "", ), "_constraints": lambda: attrb.LabelList( default = sorted({ @@ -207,7 +207,6 @@ def create_py_extension_rule_builder(**kwargs): py_extension = create_py_extension_rule_builder().build() - def _get_extension(cc_toolchain): """ Derives the appropriate file extension from the C++ toolchain. @@ -307,5 +306,5 @@ ERROR: Unsupported target platform for {self}. in rules_python's central registry (python/versions.bzl). Please ensure your target platform is configured correctly.""".format( self = ctx.label, - ) + ), ) diff --git a/tests/cc/py_extension/BUILD.bazel b/tests/cc/py_extension/BUILD.bazel index e139798b24..6a595cf57b 100644 --- a/tests/cc/py_extension/BUILD.bazel +++ b/tests/cc/py_extension/BUILD.bazel @@ -96,18 +96,18 @@ cc_library( py_extension( name = "ext_limited", + py_limited_api = "3.8", static_deps = [":ext_limited_impl"], - py_limited_api = '3.8' ) cc_library( name = "ext_limited_impl", srcs = ["ext_limited.c"], - defines = ["Py_LIMITED_API=0x3080000"], copts = [ "-fPIC", "-fvisibility=hidden", ], + defines = ["Py_LIMITED_API=0x3080000"], deps = [ "@rules_python//python/cc:current_py_cc_headers", ], diff --git a/tests/cc/py_extension/py_limited_api_tests.bzl b/tests/cc/py_extension/py_limited_api_tests.bzl index 5e344dbc31..c1a42eef64 100644 --- a/tests/cc/py_extension/py_limited_api_tests.bzl +++ b/tests/cc/py_extension/py_limited_api_tests.bzl @@ -14,30 +14,30 @@ """Tests for the py_limited_api attribute for py_extension.""" +load("@rules_cc//cc:cc_library.bzl", "cc_library") load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") load("@rules_testing//lib:truth.bzl", "matching") load("@rules_testing//lib:util.bzl", "util") load("//python/cc:py_extension.bzl", "py_extension") -load("@rules_cc//cc:cc_library.bzl", "cc_library") def _test_limited_pass_impl(env, target): env.expect.that_target(target).default_outputs().contains( - "tests/cc/py_extension/{}.abi3.so".format(target.label.name) + "tests/cc/py_extension/{}.abi3.so".format(target.label.name), ) def _test_limited_same_version(name): util.helper_target( cc_library, - name = name + '_csl', + name = name + "_csl", defines = ["Py_LIMITED_API=0x03080000"], deps = [ "@rules_python//python/cc:current_py_cc_headers", ], ) py_extension( - name = name + '_pyext', - static_deps = [':' + name + '_csl'], - py_limited_api = '3.8', + name = name + "_pyext", + static_deps = [":" + name + "_csl"], + py_limited_api = "3.8", ) analysis_test( name = name, @@ -48,16 +48,16 @@ def _test_limited_same_version(name): def _test_limited_older_dep(name): util.helper_target( cc_library, - name = name + '_csl', - defines = ["Py_LIMITED_API=0x03080000"], # 3.8 + name = name + "_csl", + defines = ["Py_LIMITED_API=0x03080000"], # 3.8 deps = [ "@rules_python//python/cc:current_py_cc_headers", ], ) py_extension( - name = name + '_pyext', - static_deps = [':' + name + '_csl'], - py_limited_api = '3.9', # 3.9 + name = name + "_pyext", + static_deps = [":" + name + "_csl"], + py_limited_api = "3.9", # 3.9 ) analysis_test( name = name, @@ -68,14 +68,14 @@ def _test_limited_older_dep(name): def _test_no_limited_api(name): util.helper_target( cc_library, - name = name + '_csl', + name = name + "_csl", deps = [ "@rules_python//python/cc:current_py_cc_headers", ], ) py_extension( - name = name + '_pyext', - static_deps = [':' + name + '_csl'], + name = name + "_pyext", + static_deps = [":" + name + "_csl"], ) analysis_test( name = name, @@ -90,15 +90,15 @@ def _test_no_limited_api_impl(env, target): def _test_no_limited_api_dep_has_limited(name): util.helper_target( cc_library, - name = name + '_csl', + name = name + "_csl", defines = ["Py_LIMITED_API=0x03080000"], deps = [ "@rules_python//python/cc:current_py_cc_headers", ], ) py_extension( - name = name + '_pyext', - static_deps = [':' + name + '_csl'], + name = name + "_pyext", + static_deps = [":" + name + "_csl"], ) analysis_test( name = name, @@ -112,12 +112,12 @@ def _test_no_limited_api_dep_has_limited_impl(env, target): def _test_limited_api_dep_has_no_python(name): util.helper_target( cc_library, - name = name + '_csl', + name = name + "_csl", ) py_extension( - name = name + '_pyext', - static_deps = [':' + name + '_csl'], - py_limited_api = '3.8', + name = name + "_pyext", + static_deps = [":" + name + "_csl"], + py_limited_api = "3.8", ) analysis_test( name = name, From ee6395dcd5044ab69a4a00664c6d1b6ac23f62e8 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 17:00:04 +0000 Subject: [PATCH 22/42] Remove print()s per buildifier. --- python/private/cc/py_extension_rule.bzl | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index f7ec72fe6f..a7353cf10a 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -81,12 +81,6 @@ def _py_extension_impl(ctx): # Add target-level linkopts last so users can override. user_link_flags.extend(ctx.attr.linkopts) - print(( - "===LINK:\n" + - " user_link_flags={user_link_flags}" - ).format( - user_link_flags = user_link_flags, - )) # todo: add linker script to hide symbols by default # py_internal allows using some private apis, which may or may not be needed. @@ -104,12 +98,6 @@ def _py_extension_impl(ctx): # todo: maybe variables_extension # todo: maybe additional_outputs ) - print(( - "===LINK OUTPUT:\n" + - " {}" - ).format( - cc_linking_outputs, - )) # Propagate CcInfo from dynamic and external deps, but not static ones. dynamic_cc_info = CcInfo(linking_context = dynamic_linking_context) From 8d807837cc9e0f279bb82fa335d6490ebb6d9e17 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 17:01:21 +0000 Subject: [PATCH 23/42] Remove unused variable (buildifier). --- python/private/cc/py_extension_rule.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index a7353cf10a..d716cd981f 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -124,7 +124,6 @@ def _py_extension_impl(ctx): propagated_cc_info, ] -_MaybeBuiltinPyInfo = [[BuiltinPyInfo]] if BuiltinPyInfo != None else [] PY_EXTENSION_ATTRS = COMMON_ATTRS | { "dynamic_deps": lambda: attrb.LabelList( From 451ea480022dc26b2ef02721150ffb09c336dff9 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 17:02:27 +0000 Subject: [PATCH 24/42] Sort keys [buildifier] --- python/private/cc/py_extension_macro.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/private/cc/py_extension_macro.bzl b/python/private/cc/py_extension_macro.bzl index 7b052de0a8..f4f2a27c35 100644 --- a/python/private/cc/py_extension_macro.bzl +++ b/python/private/cc/py_extension_macro.bzl @@ -22,9 +22,9 @@ def py_extension(**kwargs): else: if "libc" not in kwargs: kwargs["libc"] = select({ - "@rules_python//python/config_settings:_is_py_linux_libc_musl": "musl", - "@rules_python//python/config_settings:_is_py_linux_libc_glibc": "glibc", "//conditions:default": "glibc", + "@rules_python//python/config_settings:_is_py_linux_libc_glibc": "glibc", + "@rules_python//python/config_settings:_is_py_linux_libc_musl": "musl", }) _py_extension(**kwargs) From a40ae2b6fff01ec0757d34fb137c18ffc16eace6 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 17:03:10 +0000 Subject: [PATCH 25/42] Remove print()s per buildifier. --- tests/cc/py_extension/py_extension_tests.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cc/py_extension/py_extension_tests.bzl b/tests/cc/py_extension/py_extension_tests.bzl index 8235e8cd0f..b84ddb9ecb 100644 --- a/tests/cc/py_extension/py_extension_tests.bzl +++ b/tests/cc/py_extension/py_extension_tests.bzl @@ -58,7 +58,6 @@ def _test_dynamic_deps_impl(env, target): ) # CcInfo from dynamic_deps should be propagated. - print(cc_info.linking_context.linker_inputs.to_list()) env.expect.that_collection(cc_info.linking_context.linker_inputs.to_list()).has_size(1) def _test_dynamic_deps(name): From 90ad765992f91f336c11dc3d7f289db0ed6e67f1 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 17:04:05 +0000 Subject: [PATCH 26/42] Remove unused load(). --- tests/cc/py_extension/py_limited_api_tests.bzl | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cc/py_extension/py_limited_api_tests.bzl b/tests/cc/py_extension/py_limited_api_tests.bzl index c1a42eef64..46b36ec519 100644 --- a/tests/cc/py_extension/py_limited_api_tests.bzl +++ b/tests/cc/py_extension/py_limited_api_tests.bzl @@ -16,7 +16,6 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library") load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") -load("@rules_testing//lib:truth.bzl", "matching") load("@rules_testing//lib:util.bzl", "util") load("//python/cc:py_extension.bzl", "py_extension") From 708dac4b19454f9b8274a3e00d6c8bc2add5cedd Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 30 Jun 2026 17:09:58 +0000 Subject: [PATCH 27/42] Call out unused parameters [buildifier] --- tests/cc/py_extension/py_limited_api_tests.bzl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/cc/py_extension/py_limited_api_tests.bzl b/tests/cc/py_extension/py_limited_api_tests.bzl index 46b36ec519..bf5b8e457e 100644 --- a/tests/cc/py_extension/py_limited_api_tests.bzl +++ b/tests/cc/py_extension/py_limited_api_tests.bzl @@ -84,7 +84,8 @@ def _test_no_limited_api(name): def _test_no_limited_api_impl(env, target): # Should pass, nothing to assert on filename since it is platform-specific - pass + _ = env # @unused + _ = target # @unused def _test_no_limited_api_dep_has_limited(name): util.helper_target( @@ -106,7 +107,8 @@ def _test_no_limited_api_dep_has_limited(name): ) def _test_no_limited_api_dep_has_limited_impl(env, target): - pass + _ = env # @unused + _ = target # @unused def _test_limited_api_dep_has_no_python(name): util.helper_target( From 830723ff45f3a0664b6e78f859b5a8967f81da9f Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Mon, 6 Jul 2026 18:21:04 +0000 Subject: [PATCH 28/42] Add some basic tests of different dependency situations, so we can confirm py_extension behaves similarly to cc_shared_library. --- tests/cc/py_extension/BUILD.bazel | 5 + .../py_extension/dependency_graph_tests.bzl | 227 ++++++++++++++++++ 2 files changed, 232 insertions(+) create mode 100644 tests/cc/py_extension/dependency_graph_tests.bzl diff --git a/tests/cc/py_extension/BUILD.bazel b/tests/cc/py_extension/BUILD.bazel index 6a595cf57b..6b91562875 100644 --- a/tests/cc/py_extension/BUILD.bazel +++ b/tests/cc/py_extension/BUILD.bazel @@ -4,6 +4,7 @@ load("//python:py_test.bzl", "py_test") # buildifier: disable=bzl-visibility load("//python/cc:py_extension.bzl", "py_extension") +load(":dependency_graph_tests.bzl", "dependency_graph_test_suite") load(":py_extension_tests.bzl", "py_extension_analysis_test_suite") load(":py_limited_api_tests.bzl", "py_limited_api_test_suite") @@ -130,3 +131,7 @@ py_extension_analysis_test_suite( py_limited_api_test_suite( name = "py_limited_api_tests", ) + +dependency_graph_test_suite( + name = "dependency_graph_tests", +) diff --git a/tests/cc/py_extension/dependency_graph_tests.bzl b/tests/cc/py_extension/dependency_graph_tests.bzl new file mode 100644 index 0000000000..eab10c776e --- /dev/null +++ b/tests/cc/py_extension/dependency_graph_tests.bzl @@ -0,0 +1,227 @@ +# Copyright 2025 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Parity tests comparing cc_shared_library and py_extension behavior.""" + +load("@rules_cc//cc:cc_library.bzl", "cc_library") +load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") +load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") +load("@rules_testing//lib:util.bzl", "util") +load("//python/cc:py_extension.bzl", "py_extension") +# buildifier: disable=bzl-visibility +load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") + +# Test 1: CSL A -> CSL B -> CSL C (Dynamic deps) +def _test_csl_dynamic_deps(name): + util.helper_target( + cc_library, + name = name + "_libC", + srcs = ["test_lib_c.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + ) + util.helper_target( + cc_shared_library, + name = name + "_cslC", + deps = [":" + name + "_libC"], + ) + util.helper_target( + cc_library, + name = name + "_libB", + srcs = ["test_lib_b.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + deps = [":" + name + "_libC"], + ) + util.helper_target( + cc_shared_library, + name = name + "_cslB", + deps = [":" + name + "_libB"], + dynamic_deps = [":" + name + "_cslC"], + ) + util.helper_target( + cc_library, + name = name + "_libA", + srcs = ["test_lib_a.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + deps = [":" + name + "_libB", ":" + name + "_libC"], + ) + util.helper_target( + cc_shared_library, + name = name + "_cslA", + deps = [":" + name + "_libA"], + dynamic_deps = [":" + name + "_cslB", ":" + name + "_cslC"], + ) + analysis_test( + name = name, + target = name + "_cslA", + impl = _csl_dynamic_deps_test_impl, + ) + +def _csl_dynamic_deps_test_impl(env, target): + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + +# Test 2: py_extension A -> CSL B -> CSL C (Dynamic deps) +def _test_pyext_dynamic_deps(name): + util.helper_target( + cc_library, + name = name + "_libC", + srcs = ["test_lib_c.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + ) + util.helper_target( + cc_shared_library, + name = name + "_cslC", + deps = [":" + name + "_libC"], + ) + util.helper_target( + cc_library, + name = name + "_libB", + srcs = ["test_lib_b.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + deps = [":" + name + "_libC"], + ) + util.helper_target( + cc_shared_library, + name = name + "_cslB", + deps = [":" + name + "_libB"], + dynamic_deps = [":" + name + "_cslC"], + ) + util.helper_target( + cc_library, + name = name + "_libA", + srcs = ["test_lib_a.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + deps = [":" + name + "_libB", ":" + name + "_libC"], + ) + py_extension( + name = name + "_pyextA", + static_deps = [":" + name + "_libA"], + dynamic_deps = [":" + name + "_cslB", ":" + name + "_cslC"], + ) + analysis_test( + name = name, + target = name + "_pyextA", + impl = _pyext_dynamic_deps_test_impl, + ) + +def _pyext_dynamic_deps_test_impl(env, target): + env.expect.that_target(target).has_provider(CcInfo) + cc_info = target[CcInfo] + # Should propagate CcInfo from dynamic_deps (cslB and cslC) + env.expect.that_collection(cc_info.linking_context.linker_inputs.to_list()).has_size(2) + +# Test 3: CSL A -> CSL B, CL C (Static sharing) +def _test_csl_static_sharing(name): + util.helper_target( + cc_library, + name = name + "_libC", + srcs = ["test_lib_c.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + ) + util.helper_target( + cc_library, + name = name + "_libB", + srcs = ["test_lib_b.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + deps = [":" + name + "_libC"], + ) + util.helper_target( + cc_shared_library, + name = name + "_cslB", + deps = [":" + name + "_libB", ":" + name + "_libC"], + ) + util.helper_target( + cc_library, + name = name + "_libA", + srcs = ["test_lib_a.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + deps = [":" + name + "_libB", ":" + name + "_libC"], + ) + util.helper_target( + cc_shared_library, + name = name + "_cslA", + deps = [":" + name + "_libA"], + dynamic_deps = [":" + name + "_cslB"], + ) + analysis_test( + name = name, + target = name + "_cslA", + impl = _csl_static_sharing_test_impl, + ) + +def _csl_static_sharing_test_impl(env, target): + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + +# Test 4: Same as 3, but A is py_extension +def _test_pyext_static_sharing(name): + util.helper_target( + cc_library, + name = name + "_libC", + srcs = ["test_lib_c.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + ) + util.helper_target( + cc_library, + name = name + "_libB", + srcs = ["test_lib_b.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + deps = [":" + name + "_libC"], + ) + util.helper_target( + cc_shared_library, + name = name + "_cslB", + deps = [":" + name + "_libB", ":" + name + "_libC"], + ) + util.helper_target( + cc_library, + name = name + "_libA", + srcs = ["test_lib_a.c"], + hdrs = ["test_symbols.h"], + copts = ["-fPIC"], + deps = [":" + name + "_libB", ":" + name + "_libC"], + ) + py_extension( + name = name + "_pyextA", + static_deps = [":" + name + "_libA", ":" + name + "_libC"], + dynamic_deps = [":" + name + "_cslB"], + ) + analysis_test( + name = name, + target = name + "_pyextA", + impl = _pyext_static_sharing_test_impl, + ) + +def _pyext_static_sharing_test_impl(env, target): + env.expect.that_target(target).has_provider(CcInfo) + +def dependency_graph_test_suite(name): + test_suite( + name = name, + tests = [ + _test_csl_dynamic_deps, + _test_pyext_dynamic_deps, + _test_csl_static_sharing, + _test_pyext_static_sharing, + ], + ) From 37f5eaa6fe5a25ecdeefe26b39fd131a4af23c6c Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Mon, 6 Jul 2026 22:19:40 +0000 Subject: [PATCH 29/42] Replace the custom compiling and linking logic with internal cc_library and cc_shared_library targets. --- python/private/cc/py_extension_macro.bzl | 102 +++++++++--- python/private/cc/py_extension_rule.bzl | 145 +++--------------- tests/cc/py_extension/BUILD.bazel | 29 ++-- .../py_extension/dependency_graph_tests.bzl | 14 +- tests/cc/py_extension/py_extension_tests.bzl | 16 +- .../cc/py_extension/py_limited_api_tests.bzl | 10 +- 6 files changed, 127 insertions(+), 189 deletions(-) diff --git a/python/private/cc/py_extension_macro.bzl b/python/private/cc/py_extension_macro.bzl index f4f2a27c35..c28b6ee1e8 100644 --- a/python/private/cc/py_extension_macro.bzl +++ b/python/private/cc/py_extension_macro.bzl @@ -1,39 +1,91 @@ -"""Wrapper macro for the py_extension rule.""" +"""Macro for creating Python extensions.""" +load("@rules_cc//cc:cc_library.bzl", "cc_library") load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") load("//python/private:util.bzl", "add_tag") -load( - ":py_extension_rule.bzl", - _py_extension = "py_extension", - ##_py_extension_csl_rule = "py_extension_csl", -) +load(":py_extension_rule.bzl", "py_extension_wrapper") -def py_extension(**kwargs): - """A macro that calls the py_extension rule and adds a tag. +def py_extension( + name, + srcs = None, + hdrs = None, + copts = None, + defines = None, + deps = None, + dynamic_deps = None, + exports_filter = None, + user_link_flags = None, + visibility = None, + **kwargs): + """Creates a Python extension module. Args: - **kwargs: Additional arguments to pass to the rule. + name: Target name. + srcs: Optional C/C++ source files to compile directly for this extension. + hdrs: Optional header files for the srcs. + copts: Optional compiler flags for srcs. + defines: Optional preprocessor defines for srcs. + deps: cc_library targets to statically link into the extension. + dynamic_deps: cc_shared_library targets to dynamically link. + exports_filter: Filter for exported symbols passed to cc_shared_library. + user_link_flags: Additional link flags passed to cc_shared_library. + visibility: Target visibility. + **kwargs: Additional arguments passed to the underlying wrapper rule. """ add_tag(kwargs, "@rules_python//python/cc:py_extension") - use_csl = kwargs.pop("use_csl", False) - if use_csl: - _py_extension_csl(**kwargs) - else: - if "libc" not in kwargs: - kwargs["libc"] = select({ - "//conditions:default": "glibc", - "@rules_python//python/config_settings:_is_py_linux_libc_glibc": "glibc", - "@rules_python//python/config_settings:_is_py_linux_libc_musl": "musl", - }) - _py_extension(**kwargs) - -def _py_extension_csl(*, name, module_name = None, **kwargs): - if not module_name: - module_name = name + csl_deps = [] + + # 1. Handle user-supplied static deps + if deps: + csl_deps.extend(deps) + + # 2. If srcs or hdrs are specified, create an implicit cc_library for them + if srcs or hdrs: + impl_lib_name = "_" + name + "_impl" + cc_library( + name = impl_lib_name, + srcs = srcs, + hdrs = hdrs, + copts = (copts or []) + ["-fPIC"], + defines = defines, + deps = ["@rules_python//python/cc:current_py_cc_headers"], + visibility = ["//visibility:private"], + ) + csl_deps.append(":" + impl_lib_name) + + # 3. If no static deps or sources were specified, use empty target for CSL requirement + if not csl_deps: + csl_deps.append("//python/private/cc:empty") + + # 4. Create the underlying cc_shared_library + csl_name = "_" + name + "_csl" + csl_kwargs = {} + if exports_filter: + csl_kwargs["exports_filter"] = exports_filter + if user_link_flags: + csl_kwargs["user_link_flags"] = user_link_flags cc_shared_library( + name = csl_name, + deps = csl_deps, + dynamic_deps = dynamic_deps, + visibility = ["//visibility:private"], + **csl_kwargs + ) + + # 5. Select default libc constraint if not provided + if "libc" not in kwargs: + kwargs["libc"] = select({ + "//conditions:default": "glibc", + "@rules_python//python/config_settings:_is_py_linux_libc_glibc": "glibc", + "@rules_python//python/config_settings:_is_py_linux_libc_musl": "musl", + }) + + # 6. Wrap with py_extension_wrapper for PEP 3149 naming & PyInfo + py_extension_wrapper( name = name, - shared_lib_name = module_name + ".so", + src = ":" + csl_name, + visibility = visibility, **kwargs ) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index d716cd981f..395e661e4d 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -1,59 +1,21 @@ -"""Implementation of the py_extension rule.""" +"""Implementation of the _py_extension_wrapper rule.""" -load("@rules_cc//cc/common:cc_common.bzl", "cc_common") -load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") +load("@rules_cc//cc/common:cc_shared_library_info.bzl", "CcSharedLibraryInfo") load("//python:versions.bzl", "PLATFORMS") load("//python/private:attr_builders.bzl", "attrb") load("//python/private:attributes.bzl", "COMMON_ATTRS") -load("//python/private:builders.bzl", "builders") load("//python/private:py_info.bzl", "PyInfo") -load("//python/private:py_internal.bzl", "py_internal") -load("//python/private:reexports.bzl", "BuiltinPyInfo") load("//python/private:rule_builders.bzl", "ruleb") load("//python/private:toolchain_types.bzl", "PY_CC_TOOLCHAIN_TYPE") -def _py_extension_impl(ctx): +def _py_extension_wrapper_impl(ctx): module_name = ctx.attr.module_name or ctx.label.name repo_name = ctx.label.workspace_name or ctx.workspace_name import_path = repo_name if ctx.label.package: import_path = repo_name + "/" + ctx.label.package - cc_toolchain = ctx.toolchains["@bazel_tools//tools/cpp:toolchain_type"].cc - feature_configuration = cc_common.configure_features( - ctx = ctx, - cc_toolchain = cc_toolchain, - ) - - # Collect CcInfo from all deps for compilation - static_deps_infos = [dep[CcInfo] for dep in ctx.attr.static_deps] - dynamic_deps_infos = [dep[CcSharedLibraryInfo] for dep in ctx.attr.dynamic_deps] - external_deps_infos = [dep[CcInfo] for dep in ctx.attr.external_deps] - - # Static deps are linked directly into the .so - static_cc_info = cc_common.merge_cc_infos( - cc_infos = static_deps_infos, - ) - - # Dynamic deps are linked as shared libraries - linker_inputs = [dep.linker_input for dep in dynamic_deps_infos] - dynamic_linking_context = cc_common.create_linking_context( - linker_inputs = depset(linker_inputs), - ) - - user_link_flags = [] - user_link_flags.append("-Wl,--export-dynamic-symbol=PyInit_{module_name}".format( - module_name = module_name, - )) - - # The PyInit symbol looks unused, so the linker optimizes it away. Telling it - # to treat it as undefined causes it to be retained. - user_link_flags.append("-Wl,--undefined=PyInit_{module_name}".format( - module_name = module_name, - )) - - if ctx.attr.external_deps: - user_link_flags.append("-Wl,--allow-shlib-undefined") + cc_toolchain = ctx.toolchains["@bazel_tools//tools/cpp:toolchain_type"].cc ext = _get_extension(cc_toolchain) use_py_limited_api = bool(ctx.attr.py_limited_api) if use_py_limited_api: @@ -71,46 +33,18 @@ def _py_extension_impl(ctx): platform = platform_tag, ext = ext, ) - py_dso = ctx.actions.declare_file(output_filename) - static_linking_context = static_cc_info.linking_context - linking_contexts = [ - static_linking_context, - dynamic_linking_context, - ] - - # Add target-level linkopts last so users can override. - user_link_flags.extend(ctx.attr.linkopts) - - # todo: add linker script to hide symbols by default - # py_internal allows using some private apis, which may or may not be needed. - # based upon cc_shared_library.bzl - cc_linking_outputs = py_internal.link( - actions = ctx.actions, - feature_configuration = feature_configuration, - cc_toolchain = cc_toolchain, - linking_contexts = linking_contexts, - user_link_flags = user_link_flags, - # todo: add additional_inputs - name = ctx.label.name, - output_type = "dynamic_library", - main_output = py_dso, - # todo: maybe variables_extension - # todo: maybe additional_outputs - ) + py_dso = ctx.actions.declare_file(output_filename) - # Propagate CcInfo from dynamic and external deps, but not static ones. - dynamic_cc_info = CcInfo(linking_context = dynamic_linking_context) - propagated_cc_info = cc_common.merge_cc_infos( - cc_infos = [dynamic_cc_info] + external_deps_infos, + # Symlink the cc_shared_library output to the PEP 3149 / abi3 filename + csl_target = ctx.attr.src + csl_file = csl_target[DefaultInfo].files.to_list()[0] + ctx.actions.symlink( + output = py_dso, + target_file = csl_file, ) - runfiles_builder = builders.RunfilesBuilder() - runfiles_builder.add(py_dso) - runfiles_builder.add_targets(ctx.attr.static_deps) - runfiles_builder.add_targets(ctx.attr.dynamic_deps) - runfiles_builder.add_targets(ctx.attr.external_deps) - runfiles = runfiles_builder.build(ctx) + runfiles = ctx.runfiles(files = [py_dso]).merge(csl_target[DefaultInfo].default_runfiles) return [ DefaultInfo( @@ -121,51 +55,18 @@ def _py_extension_impl(ctx): transitive_sources = depset([py_dso]), imports = depset([import_path]), ), - propagated_cc_info, + csl_target[CcSharedLibraryInfo], ] - -PY_EXTENSION_ATTRS = COMMON_ATTRS | { - "dynamic_deps": lambda: attrb.LabelList( +PY_EXTENSION_WRAPPER_ATTRS = COMMON_ATTRS | { + "src": lambda: attrb.Label( + mandatory = True, providers = [CcSharedLibraryInfo], - doc = "cc_shared_library targets to be dynamically linked.", - default = [], + doc = "The cc_shared_library target to wrap.", ), - "external_deps": lambda: attrb.LabelList( - providers = [CcInfo], - doc = "cc_library targets with external linkage.", - default = [], - ), - "static_deps": lambda: attrb.LabelList( - providers = [CcInfo], - doc = "cc_library targets to be statically and privately linked.", - default = [], - ), - "copts": lambda: attrb.StringList(), "libc": lambda: attrb.String(default = "glibc"), - "linkopts": lambda: attrb.StringList(), "module_name": lambda: attrb.String(), "py_limited_api": lambda: attrb.String( - doc = """ -The minimum Python version to target for the Limited API (e.g., '3.8'). - -If set to a version string (e.g., '3.8') instead of '' (empty string): - - Configures the output filename to use the simple '.abi3' suffix - (e.g., 'ext.abi3.so'). - -Note: Since the py_extension rule only links pre-compiled libraries, -you must manually add the preprocessor macro to the cc_library targets -that compile your C/C++ sources, for example: - cc_library( - name = "my_impl", - srcs = ["my_code.c"], - defines = ["Py_LIMITED_API=0x03080000"], - ... - ) - -Set to '' (the default) or None to build a standard, version-specific -extension. -""", default = "", ), "_constraints": lambda: attrb.LabelList( @@ -177,12 +78,12 @@ extension. ), } -def create_py_extension_rule_builder(**kwargs): - """Create a rule builder for a py_extension.""" +def create_py_extension_wrapper_rule_builder(**kwargs): + """Create a rule builder for the wrapper.""" builder = ruleb.Rule( - implementation = _py_extension_impl, - attrs = PY_EXTENSION_ATTRS, - provides = [PyInfo, CcInfo], + implementation = _py_extension_wrapper_impl, + attrs = PY_EXTENSION_WRAPPER_ATTRS, + provides = [PyInfo, CcSharedLibraryInfo], toolchains = [ ruleb.ToolchainType(PY_CC_TOOLCHAIN_TYPE), ruleb.ToolchainType("@bazel_tools//tools/cpp:toolchain_type"), @@ -192,7 +93,7 @@ def create_py_extension_rule_builder(**kwargs): ) return builder -py_extension = create_py_extension_rule_builder().build() +py_extension_wrapper = create_py_extension_wrapper_rule_builder().build() def _get_extension(cc_toolchain): """ diff --git a/tests/cc/py_extension/BUILD.bazel b/tests/cc/py_extension/BUILD.bazel index 6b91562875..5ee8a15b6e 100644 --- a/tests/cc/py_extension/BUILD.bazel +++ b/tests/cc/py_extension/BUILD.bazel @@ -16,33 +16,25 @@ package( licenses(["notice"]) py_extension( - name = "ext_static", - ##srcs = ["ext_static.c"], - static_deps = [":static_dep"], + # An extension defined solely by source files, with no deps + name = "ext_source", + srcs = ["ext_source.c"], ) py_extension( - name = "ext_shared", - dynamic_deps = [ - ":add_one_shared", - ], - static_deps = [ - ":ext_shared_impl", - ], + # A python extension that gets its code from a statically-linked library + name = "ext_static", + deps = [":static_dep"], ) py_extension( - name = "ext_csl_shared", + # A python extension that dynamically links to another shared library + name = "ext_shared", dynamic_deps = [ ":add_one_shared", ], - exports_filter = [ - "//tests/cc/py_extension:ext_shared_impl", - ":ext_shared_impl", - ], - module_name = "ext_shared", - use_csl = True, deps = [ + # ":ext_shared_impl", ], ) @@ -96,9 +88,10 @@ cc_library( ) py_extension( + # An extension that uses the Python limited API name = "ext_limited", py_limited_api = "3.8", - static_deps = [":ext_limited_impl"], + deps = [":ext_limited_impl"], ) cc_library( diff --git a/tests/cc/py_extension/dependency_graph_tests.bzl b/tests/cc/py_extension/dependency_graph_tests.bzl index eab10c776e..95b32560bc 100644 --- a/tests/cc/py_extension/dependency_graph_tests.bzl +++ b/tests/cc/py_extension/dependency_graph_tests.bzl @@ -16,11 +16,10 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library") load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") +load("@rules_cc//cc/common:cc_shared_library_info.bzl", "CcSharedLibraryInfo") load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") load("@rules_testing//lib:util.bzl", "util") load("//python/cc:py_extension.bzl", "py_extension") -# buildifier: disable=bzl-visibility -load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") # Test 1: CSL A -> CSL B -> CSL C (Dynamic deps) def _test_csl_dynamic_deps(name): @@ -111,7 +110,7 @@ def _test_pyext_dynamic_deps(name): ) py_extension( name = name + "_pyextA", - static_deps = [":" + name + "_libA"], + deps = [":" + name + "_libA"], dynamic_deps = [":" + name + "_cslB", ":" + name + "_cslC"], ) analysis_test( @@ -121,10 +120,7 @@ def _test_pyext_dynamic_deps(name): ) def _pyext_dynamic_deps_test_impl(env, target): - env.expect.that_target(target).has_provider(CcInfo) - cc_info = target[CcInfo] - # Should propagate CcInfo from dynamic_deps (cslB and cslC) - env.expect.that_collection(cc_info.linking_context.linker_inputs.to_list()).has_size(2) + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) # Test 3: CSL A -> CSL B, CL C (Static sharing) def _test_csl_static_sharing(name): @@ -203,7 +199,7 @@ def _test_pyext_static_sharing(name): ) py_extension( name = name + "_pyextA", - static_deps = [":" + name + "_libA", ":" + name + "_libC"], + deps = [":" + name + "_libA"], dynamic_deps = [":" + name + "_cslB"], ) analysis_test( @@ -213,7 +209,7 @@ def _test_pyext_static_sharing(name): ) def _pyext_static_sharing_test_impl(env, target): - env.expect.that_target(target).has_provider(CcInfo) + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) def dependency_graph_test_suite(name): test_suite( diff --git a/tests/cc/py_extension/py_extension_tests.bzl b/tests/cc/py_extension/py_extension_tests.bzl index b84ddb9ecb..3305d8d8d9 100644 --- a/tests/cc/py_extension/py_extension_tests.bzl +++ b/tests/cc/py_extension/py_extension_tests.bzl @@ -14,7 +14,7 @@ """Tests for py_extension.""" -load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") +load("@rules_cc//cc/common:cc_shared_library_info.bzl", "CcSharedLibraryInfo") load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") load("@rules_testing//lib:truth.bzl", "matching") load("//python/private:py_info.bzl", "PyInfo") @@ -24,8 +24,7 @@ _tests = [] def _test_static_deps_impl(env, target): env.expect.that_target(target).has_provider(PyInfo) py_info = target[PyInfo] - env.expect.that_target(target).has_provider(CcInfo) - cc_info = target[CcInfo] + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) # The .so should be in PyInfo env.expect.that_collection(py_info.transitive_sources.to_list()).has_size(1) @@ -33,9 +32,6 @@ def _test_static_deps_impl(env, target): matching.file_basename_equals("ext_static.cpython-311-x86_64-linux-gnu.so"), ) - # CcInfo from static_deps should not be propagated. - env.expect.that_depset_of_files(cc_info.linking_context.linker_inputs).contains_exactly([]) - def _test_static_deps(name): analysis_test( name = name, @@ -48,8 +44,8 @@ _tests.append(_test_static_deps) def _test_dynamic_deps_impl(env, target): env.expect.that_target(target).has_provider(PyInfo) py_info = target[PyInfo] - env.expect.that_target(target).has_provider(CcInfo) - cc_info = target[CcInfo] + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + csl_info = target[CcSharedLibraryInfo] # The .so should be in PyInfo env.expect.that_collection(py_info.transitive_sources.to_list()).has_size(1) @@ -57,8 +53,8 @@ def _test_dynamic_deps_impl(env, target): matching.file_basename_equals("ext_shared.cpython-311-x86_64-linux-gnu.so"), ) - # CcInfo from dynamic_deps should be propagated. - env.expect.that_collection(cc_info.linking_context.linker_inputs.to_list()).has_size(1) + # CcSharedLibraryInfo provider should be present and non-empty + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) def _test_dynamic_deps(name): analysis_test( diff --git a/tests/cc/py_extension/py_limited_api_tests.bzl b/tests/cc/py_extension/py_limited_api_tests.bzl index bf5b8e457e..a59628c19c 100644 --- a/tests/cc/py_extension/py_limited_api_tests.bzl +++ b/tests/cc/py_extension/py_limited_api_tests.bzl @@ -35,7 +35,7 @@ def _test_limited_same_version(name): ) py_extension( name = name + "_pyext", - static_deps = [":" + name + "_csl"], + deps = [":" + name + "_csl"], py_limited_api = "3.8", ) analysis_test( @@ -55,7 +55,7 @@ def _test_limited_older_dep(name): ) py_extension( name = name + "_pyext", - static_deps = [":" + name + "_csl"], + deps = [":" + name + "_csl"], py_limited_api = "3.9", # 3.9 ) analysis_test( @@ -74,7 +74,7 @@ def _test_no_limited_api(name): ) py_extension( name = name + "_pyext", - static_deps = [":" + name + "_csl"], + deps = [":" + name + "_csl"], ) analysis_test( name = name, @@ -98,7 +98,7 @@ def _test_no_limited_api_dep_has_limited(name): ) py_extension( name = name + "_pyext", - static_deps = [":" + name + "_csl"], + deps = [":" + name + "_csl"], ) analysis_test( name = name, @@ -117,7 +117,7 @@ def _test_limited_api_dep_has_no_python(name): ) py_extension( name = name + "_pyext", - static_deps = [":" + name + "_csl"], + deps = [":" + name + "_csl"], py_limited_api = "3.8", ) analysis_test( From 4596ae291ccdbbaf4fd54f779093e7a8fa127456 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Mon, 6 Jul 2026 22:36:05 +0000 Subject: [PATCH 30/42] Add missing files. --- tests/cc/py_extension/ext_source.c | 33 ++++++++++++++++++++++++++++++ tests/cc/py_extension/test_lib_a.c | 6 ++++++ tests/cc/py_extension/test_lib_b.c | 5 +++++ tests/cc/py_extension/test_lib_c.c | 6 ++++++ 4 files changed, 50 insertions(+) create mode 100644 tests/cc/py_extension/ext_source.c create mode 100644 tests/cc/py_extension/test_lib_a.c create mode 100644 tests/cc/py_extension/test_lib_b.c create mode 100644 tests/cc/py_extension/test_lib_c.c diff --git a/tests/cc/py_extension/ext_source.c b/tests/cc/py_extension/ext_source.c new file mode 100644 index 0000000000..df0239df3a --- /dev/null +++ b/tests/cc/py_extension/ext_source.c @@ -0,0 +1,33 @@ + +#include + + +static PyObject* calc_one_plus_two(PyObject* self, PyObject* args) { + return PyLong_FromLong(1 + 2); +} + + +// Method definition object for this extension, these are the functions +// that will be available in the module. +static PyMethodDef ModuleMethods[] = { + {"calc_one_plus_two", calc_one_plus_two, METH_NOARGS, "A simple C function."}, + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +// Module definition +// The arguments of this structure tell Python what to call your extension, +// what its methods are and where to look for its method definitions. +static struct PyModuleDef ext_source_module = { + PyModuleDef_HEAD_INIT, + "ext_source", /* name of module */ + NULL, /* module documentation, may be NULL */ + -1, /* size of per-interpreter state of the module, + or -1 if the module keeps state in global variables. */ + ModuleMethods +}; + +// The module init function. This must be exported and retained in the +// shared library output. +PyMODINIT_FUNC PyInit_ext_source(void) { + return PyModule_Create(&ext_source_module); +} diff --git a/tests/cc/py_extension/test_lib_a.c b/tests/cc/py_extension/test_lib_a.c new file mode 100644 index 0000000000..19e2f489bf --- /dev/null +++ b/tests/cc/py_extension/test_lib_a.c @@ -0,0 +1,6 @@ +#include "test_symbols.h" + +void fnA() { + fnB(); + fnC(); +} diff --git a/tests/cc/py_extension/test_lib_b.c b/tests/cc/py_extension/test_lib_b.c new file mode 100644 index 0000000000..3621587c1c --- /dev/null +++ b/tests/cc/py_extension/test_lib_b.c @@ -0,0 +1,5 @@ +#include "test_symbols.h" + +void fnB() { + fnC(); +} diff --git a/tests/cc/py_extension/test_lib_c.c b/tests/cc/py_extension/test_lib_c.c new file mode 100644 index 0000000000..99941576dd --- /dev/null +++ b/tests/cc/py_extension/test_lib_c.c @@ -0,0 +1,6 @@ +#include "test_symbols.h" +#include + +void fnC() { + printf("fnC\n"); +} From 933f69fe43e14d79a20e66544398fa6c5e70409e Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Mon, 6 Jul 2026 22:38:31 +0000 Subject: [PATCH 31/42] Add a data argument to the macro. --- python/private/cc/py_extension_macro.bzl | 1 + python/private/cc/py_extension_rule.bzl | 8 +++++++- tests/cc/py_extension/BUILD.bazel | 6 ++++++ tests/cc/py_extension/py_extension_tests.bzl | 20 ++++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/python/private/cc/py_extension_macro.bzl b/python/private/cc/py_extension_macro.bzl index c28b6ee1e8..5bf5e6c8e3 100644 --- a/python/private/cc/py_extension_macro.bzl +++ b/python/private/cc/py_extension_macro.bzl @@ -30,6 +30,7 @@ def py_extension( exports_filter: Filter for exported symbols passed to cc_shared_library. user_link_flags: Additional link flags passed to cc_shared_library. visibility: Target visibility. + data: Optional list of files or targets needed by this extension at runtime. **kwargs: Additional arguments passed to the underlying wrapper rule. """ add_tag(kwargs, "@rules_python//python/cc:py_extension") diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 395e661e4d..a504a49b4d 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -4,6 +4,7 @@ load("@rules_cc//cc/common:cc_shared_library_info.bzl", "CcSharedLibraryInfo") load("//python:versions.bzl", "PLATFORMS") load("//python/private:attr_builders.bzl", "attrb") load("//python/private:attributes.bzl", "COMMON_ATTRS") +load("//python/private:builders.bzl", "builders") load("//python/private:py_info.bzl", "PyInfo") load("//python/private:rule_builders.bzl", "ruleb") load("//python/private:toolchain_types.bzl", "PY_CC_TOOLCHAIN_TYPE") @@ -44,7 +45,12 @@ def _py_extension_wrapper_impl(ctx): target_file = csl_file, ) - runfiles = ctx.runfiles(files = [py_dso]).merge(csl_target[DefaultInfo].default_runfiles) + runfiles_builder = builders.RunfilesBuilder() + runfiles_builder.add(py_dso) + runfiles_builder.add(ctx.files.data) + runfiles_builder.add_targets(ctx.attr.data) + runfiles_builder.add(csl_target[DefaultInfo].default_runfiles) + runfiles = runfiles_builder.build(ctx) return [ DefaultInfo( diff --git a/tests/cc/py_extension/BUILD.bazel b/tests/cc/py_extension/BUILD.bazel index 5ee8a15b6e..c687872ec6 100644 --- a/tests/cc/py_extension/BUILD.bazel +++ b/tests/cc/py_extension/BUILD.bazel @@ -27,6 +27,12 @@ py_extension( deps = [":static_dep"], ) +py_extension( + name = "ext_with_data", + deps = [":static_dep"], + data = ["test_symbols.h"], +) + py_extension( # A python extension that dynamically links to another shared library name = "ext_shared", diff --git a/tests/cc/py_extension/py_extension_tests.bzl b/tests/cc/py_extension/py_extension_tests.bzl index 3305d8d8d9..b21880f83f 100644 --- a/tests/cc/py_extension/py_extension_tests.bzl +++ b/tests/cc/py_extension/py_extension_tests.bzl @@ -41,6 +41,26 @@ def _test_static_deps(name): _tests.append(_test_static_deps) +def _test_data_deps_impl(env, target): + env.expect.that_target(target).has_provider(PyInfo) + py_info = target[PyInfo] + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + + # Check that data file is in runfiles + default_info = target[DefaultInfo] + env.expect.that_depset_of_files(default_info.default_runfiles.files).contains_predicate( + matching.file_basename_equals("test_symbols.h"), + ) + +def _test_data_deps(name): + analysis_test( + name = name, + impl = _test_data_deps_impl, + target = "//tests/cc/py_extension:ext_with_data", + ) + +_tests.append(_test_data_deps) + def _test_dynamic_deps_impl(env, target): env.expect.that_target(target).has_provider(PyInfo) py_info = target[PyInfo] From 6f05ae0ee7474d4d15063b380effca4820fbd012 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 7 Jul 2026 00:06:54 +0000 Subject: [PATCH 32/42] Add missing file --- tests/cc/py_extension/test_symbols.h | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tests/cc/py_extension/test_symbols.h diff --git a/tests/cc/py_extension/test_symbols.h b/tests/cc/py_extension/test_symbols.h new file mode 100644 index 0000000000..59ab3b02e7 --- /dev/null +++ b/tests/cc/py_extension/test_symbols.h @@ -0,0 +1,8 @@ +#ifndef TEST_SYMBOLS_H +#define TEST_SYMBOLS_H + +void fnC(); +void fnB(); +void fnA(); + +#endif // TEST_SYMBOLS_H From 8f2fa549d6c3294560bd751fe393d6bf051a73da Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 7 Jul 2026 16:36:32 +0000 Subject: [PATCH 33/42] Add a couple more examples for PyInit_* defined in dependency targets. --- tests/cc/py_extension/BUILD.bazel | 64 +++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/tests/cc/py_extension/BUILD.bazel b/tests/cc/py_extension/BUILD.bazel index c687872ec6..65d37b73da 100644 --- a/tests/cc/py_extension/BUILD.bazel +++ b/tests/cc/py_extension/BUILD.bazel @@ -15,24 +15,39 @@ package( licenses(["notice"]) +##### + py_extension( # An extension defined solely by source files, with no deps name = "ext_source", srcs = ["ext_source.c"], ) +##### + py_extension( # A python extension that gets its code from a statically-linked library name = "ext_static", deps = [":static_dep"], ) +cc_library( + name = "static_dep", + srcs = ["static_dep.c"], + hdrs = ["static_dep.h"], +) + +##### + py_extension( + # An extension that also depends on a data file name = "ext_with_data", - deps = [":static_dep"], data = ["test_symbols.h"], + deps = [":static_dep"], ) +##### + py_extension( # A python extension that dynamically links to another shared library name = "ext_shared", @@ -62,12 +77,6 @@ cc_library( ], ) -cc_library( - name = "static_dep", - srcs = ["static_dep.c"], - hdrs = ["static_dep.h"], -) - cc_shared_library( name = "add_one_shared", deps = [":add_one_impl"], @@ -93,6 +102,8 @@ cc_library( hdrs = ["add_one_helper.h"], ) +##### + py_extension( # An extension that uses the Python limited API name = "ext_limited", @@ -113,6 +124,45 @@ cc_library( ], ) +##### + +py_extension( + # An extension with its PyInit_* function in a static dependency + name = "ext_init_in_dep", + deps = [":ext_init_in_dep_impl"], +) + +cc_library( + name = "ext_init_in_dep_impl", + srcs = ["ext_init_in_dep.c"], + deps = [ + "@rules_python//python/cc:current_py_cc_headers", + ], +) + +##### + +py_extension( + # An extension with its PyInit_* function in a dynamic dependency + name = "ext_init_in_dynamic_dep", + dynamic_deps = [":ext_init_in_dynamic_dep_2"], +) + +cc_shared_library( + name = "ext_init_in_dynamic_dep_2", + deps = [":ext_init_in_dynamic_dep_impl"], +) + +cc_library( + name = "ext_init_in_dynamic_dep_impl", + srcs = ["ext_init_in_dynamic_dep.c"], + deps = [ + "@rules_python//python/cc:current_py_cc_headers", + ], +) + +##### + py_test( name = "py_extension_test", srcs = ["py_extension_test.py"], From 908ccd5bc63b8fa52041528f6f32611e8b29cc77 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 7 Jul 2026 16:55:20 +0000 Subject: [PATCH 34/42] Add missing files --- tests/cc/py_extension/ext_init_in_dep.c | 20 +++++++++++++++++++ .../cc/py_extension/ext_init_in_dynamic_dep.c | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 tests/cc/py_extension/ext_init_in_dep.c create mode 100644 tests/cc/py_extension/ext_init_in_dynamic_dep.c diff --git a/tests/cc/py_extension/ext_init_in_dep.c b/tests/cc/py_extension/ext_init_in_dep.c new file mode 100644 index 0000000000..a6d32ba0b2 --- /dev/null +++ b/tests/cc/py_extension/ext_init_in_dep.c @@ -0,0 +1,20 @@ + +#include + +// No methods defined; we're just testing the init function. +static PyMethodDef ModuleMethods[] = { + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +static struct PyModuleDef ext_init_in_dep_module = { + PyModuleDef_HEAD_INIT, + "ext_init_in_dep", /* name of module */ + NULL, /* module documentation, may be NULL */ + -1, /* size of per-interpreter state of the module, + or -1 if the module keeps state in global variables. */ + ModuleMethods +}; + +PyMODINIT_FUNC PyInit_ext_init_in_dep(void) { + return PyModule_Create(&ext_init_in_dep_module); +} diff --git a/tests/cc/py_extension/ext_init_in_dynamic_dep.c b/tests/cc/py_extension/ext_init_in_dynamic_dep.c new file mode 100644 index 0000000000..ad196adb06 --- /dev/null +++ b/tests/cc/py_extension/ext_init_in_dynamic_dep.c @@ -0,0 +1,20 @@ + +#include + +// No methods defined; we're just testing the init function. +static PyMethodDef ModuleMethods[] = { + {NULL, NULL, 0, NULL} /* Sentinel */ +}; + +static struct PyModuleDef ext_init_in_dynamic_dep_module = { + PyModuleDef_HEAD_INIT, + "ext_init_in_dynamic_dep", /* name of module */ + NULL, /* module documentation, may be NULL */ + -1, /* size of per-interpreter state of the module, + or -1 if the module keeps state in global variables. */ + ModuleMethods +}; + +PyMODINIT_FUNC PyInit_ext_init_in_dynamic_dep(void) { + return PyModule_Create(&ext_init_in_dynamic_dep_module); +} From eb4b8a8981125b77ac7df1a859933fa8b5d38357 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 7 Jul 2026 17:54:12 +0000 Subject: [PATCH 35/42] Expand the analysis tests with more details assertions. --- .../py_extension/dependency_graph_tests.bzl | 217 ++++++++++++------ 1 file changed, 145 insertions(+), 72 deletions(-) diff --git a/tests/cc/py_extension/dependency_graph_tests.bzl b/tests/cc/py_extension/dependency_graph_tests.bzl index 95b32560bc..be82931c98 100644 --- a/tests/cc/py_extension/dependency_graph_tests.bzl +++ b/tests/cc/py_extension/dependency_graph_tests.bzl @@ -21,8 +21,8 @@ load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") load("@rules_testing//lib:util.bzl", "util") load("//python/cc:py_extension.bzl", "py_extension") -# Test 1: CSL A -> CSL B -> CSL C (Dynamic deps) -def _test_csl_dynamic_deps(name): +# For tests 1 and 2 +def _create_dynamic_deps_helpers(name): util.helper_target( cc_library, name = name + "_libC", @@ -57,6 +57,10 @@ def _test_csl_dynamic_deps(name): copts = ["-fPIC"], deps = [":" + name + "_libB", ":" + name + "_libC"], ) + +# Test 1: CSL A -> CSL B -> CSL C (Dynamic deps) +def _test_csl_dynamic_deps_top(name): + _create_dynamic_deps_helpers(name) util.helper_target( cc_shared_library, name = name + "_cslA", @@ -71,43 +75,23 @@ def _test_csl_dynamic_deps(name): def _csl_dynamic_deps_test_impl(env, target): env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + csl_info = target[CcSharedLibraryInfo] + + # Derive labels + test_name = target.label.name[:-5] # remove "_cslA" + libA_label = target.label.same_package_label(test_name + "_libA") + libB_label = target.label.same_package_label(test_name + "_libB") + libC_label = target.label.same_package_label(test_name + "_libC") + + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libA_label)]) + if hasattr(csl_info, "link_once_static_libs"): + static_libs = [str(l) for l in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(libA_label)) + env.expect.that_collection(static_libs).contains_none_of([str(libB_label), str(libC_label)]) # Test 2: py_extension A -> CSL B -> CSL C (Dynamic deps) -def _test_pyext_dynamic_deps(name): - util.helper_target( - cc_library, - name = name + "_libC", - srcs = ["test_lib_c.c"], - hdrs = ["test_symbols.h"], - copts = ["-fPIC"], - ) - util.helper_target( - cc_shared_library, - name = name + "_cslC", - deps = [":" + name + "_libC"], - ) - util.helper_target( - cc_library, - name = name + "_libB", - srcs = ["test_lib_b.c"], - hdrs = ["test_symbols.h"], - copts = ["-fPIC"], - deps = [":" + name + "_libC"], - ) - util.helper_target( - cc_shared_library, - name = name + "_cslB", - deps = [":" + name + "_libB"], - dynamic_deps = [":" + name + "_cslC"], - ) - util.helper_target( - cc_library, - name = name + "_libA", - srcs = ["test_lib_a.c"], - hdrs = ["test_symbols.h"], - copts = ["-fPIC"], - deps = [":" + name + "_libB", ":" + name + "_libC"], - ) +def _test_pyext_dynamic_deps_top(name): + _create_dynamic_deps_helpers(name) py_extension( name = name + "_pyextA", deps = [":" + name + "_libA"], @@ -119,11 +103,72 @@ def _test_pyext_dynamic_deps(name): impl = _pyext_dynamic_deps_test_impl, ) +def _test_pyext_dynamic_deps_cslB(name): + _create_dynamic_deps_helpers(name) + analysis_test( + name = name, + target = name + "_cslB", + impl = _cslB_deps_test_impl, + ) + +def _test_pyext_dynamic_deps_cslC(name): + _create_dynamic_deps_helpers(name) + analysis_test( + name = name, + target = name + "_cslC", + impl = _cslC_deps_test_impl, + ) + +def _cslC_deps_test_impl(env, target): + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + csl_info = target[CcSharedLibraryInfo] + + # Derive labels + test_name = target.label.name[:-5] # remove "_cslC" + libC_label = target.label.same_package_label(test_name + "_libC") + + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libC_label)]) + if hasattr(csl_info, "link_once_static_libs"): + env.expect.that_collection([str(l) for l in csl_info.link_once_static_libs]).contains_exactly([str(libC_label)]) + +def _cslB_deps_test_impl(env, target): + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + csl_info = target[CcSharedLibraryInfo] + + # Derive labels + test_name = target.label.name[:-5] # remove "_cslB" + libB_label = target.label.same_package_label(test_name + "_libB") + libC_label = target.label.same_package_label(test_name + "_libC") + cslC_label = target.label.same_package_label(test_name + "_cslC") + + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libB_label)]) + if hasattr(csl_info, "link_once_static_libs"): + static_libs = [str(l) for l in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(libB_label)) + env.expect.that_collection(static_libs).contains_none_of([str(libC_label)]) + + if hasattr(csl_info, "dynamic_deps"): + dynamic_deps = [str(d.linker_input.owner) for d in csl_info.dynamic_deps.to_list()] + env.expect.that_collection(dynamic_deps).contains(str(cslC_label)) + def _pyext_dynamic_deps_test_impl(env, target): env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + csl_info = target[CcSharedLibraryInfo] -# Test 3: CSL A -> CSL B, CL C (Static sharing) -def _test_csl_static_sharing(name): + # Derive labels + test_name = target.label.name[:-7] # remove "_pyextA" + libA_label = target.label.same_package_label(test_name + "_libA") + libB_label = target.label.same_package_label(test_name + "_libB") + libC_label = target.label.same_package_label(test_name + "_libC") + + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libA_label)]) + if hasattr(csl_info, "link_once_static_libs"): + static_libs = [str(l) for l in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(libA_label)) + env.expect.that_collection(static_libs).contains_none_of([str(libB_label), str(libC_label)]) + +# For tests 3 and 4 +def _create_static_sharing_helpers(name): util.helper_target( cc_library, name = name + "_libC", @@ -152,6 +197,10 @@ def _test_csl_static_sharing(name): copts = ["-fPIC"], deps = [":" + name + "_libB", ":" + name + "_libC"], ) + +# Test 3: CSL A -> CSL B, CL C (Static sharing) +def _test_csl_static_sharing_top(name): + _create_static_sharing_helpers(name) util.helper_target( cc_shared_library, name = name + "_cslA", @@ -166,37 +215,23 @@ def _test_csl_static_sharing(name): def _csl_static_sharing_test_impl(env, target): env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + csl_info = target[CcSharedLibraryInfo] + + # Derive labels + test_name = target.label.name[:-5] # remove "_cslA" + libA_label = target.label.same_package_label(test_name + "_libA") + libB_label = target.label.same_package_label(test_name + "_libB") + libC_label = target.label.same_package_label(test_name + "_libC") + + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libA_label)]) + if hasattr(csl_info, "link_once_static_libs"): + static_libs = [str(l) for l in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(libA_label)) + env.expect.that_collection(static_libs).contains_none_of([str(libB_label), str(libC_label)]) # Test 4: Same as 3, but A is py_extension -def _test_pyext_static_sharing(name): - util.helper_target( - cc_library, - name = name + "_libC", - srcs = ["test_lib_c.c"], - hdrs = ["test_symbols.h"], - copts = ["-fPIC"], - ) - util.helper_target( - cc_library, - name = name + "_libB", - srcs = ["test_lib_b.c"], - hdrs = ["test_symbols.h"], - copts = ["-fPIC"], - deps = [":" + name + "_libC"], - ) - util.helper_target( - cc_shared_library, - name = name + "_cslB", - deps = [":" + name + "_libB", ":" + name + "_libC"], - ) - util.helper_target( - cc_library, - name = name + "_libA", - srcs = ["test_lib_a.c"], - hdrs = ["test_symbols.h"], - copts = ["-fPIC"], - deps = [":" + name + "_libB", ":" + name + "_libC"], - ) +def _test_pyext_static_sharing_top(name): + _create_static_sharing_helpers(name) py_extension( name = name + "_pyextA", deps = [":" + name + "_libA"], @@ -208,16 +243,54 @@ def _test_pyext_static_sharing(name): impl = _pyext_static_sharing_test_impl, ) +def _test_pyext_static_sharing_cslB(name): + _create_static_sharing_helpers(name) + analysis_test( + name = name, + target = name + "_cslB", + impl = _cslB_static_sharing_test_impl, + ) + +def _cslB_static_sharing_test_impl(env, target): + env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + csl_info = target[CcSharedLibraryInfo] + + # Derive labels + test_name = target.label.name[:-5] # remove "_cslB" + libB_label = target.label.same_package_label(test_name + "_libB") + libC_label = target.label.same_package_label(test_name + "_libC") + + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libB_label), str(libC_label)]) + if hasattr(csl_info, "link_once_static_libs"): + static_libs = [str(l) for l in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains_exactly([str(libB_label), str(libC_label)]) + def _pyext_static_sharing_test_impl(env, target): env.expect.that_target(target).has_provider(CcSharedLibraryInfo) + csl_info = target[CcSharedLibraryInfo] + + # Derive labels + test_name = target.label.name[:-7] # remove "_pyextA" + libA_label = target.label.same_package_label(test_name + "_libA") + libB_label = target.label.same_package_label(test_name + "_libB") + libC_label = target.label.same_package_label(test_name + "_libC") + + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libA_label)]) + if hasattr(csl_info, "link_once_static_libs"): + static_libs = [str(l) for l in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(libA_label)) + env.expect.that_collection(static_libs).contains_none_of([str(libB_label), str(libC_label)]) def dependency_graph_test_suite(name): test_suite( name = name, tests = [ - _test_csl_dynamic_deps, - _test_pyext_dynamic_deps, - _test_csl_static_sharing, - _test_pyext_static_sharing, + _test_csl_dynamic_deps_top, + _test_pyext_dynamic_deps_top, + _test_pyext_dynamic_deps_cslB, + _test_pyext_dynamic_deps_cslC, + _test_csl_static_sharing_top, + _test_pyext_static_sharing_top, + _test_pyext_static_sharing_cslB, ], ) From 12bc59ea05eceecc1c1a9be0d6147c8779aa9978 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 7 Jul 2026 19:50:07 +0000 Subject: [PATCH 36/42] Re-format files --- python/private/cc/py_extension_macro.bzl | 2 +- python/private/cc/py_extension_rule.bzl | 10 +++++----- tests/cc/py_extension/dependency_graph_tests.bzl | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/python/private/cc/py_extension_macro.bzl b/python/private/cc/py_extension_macro.bzl index 5bf5e6c8e3..ea25f92bb8 100644 --- a/python/private/cc/py_extension_macro.bzl +++ b/python/private/cc/py_extension_macro.bzl @@ -78,9 +78,9 @@ def py_extension( # 5. Select default libc constraint if not provided if "libc" not in kwargs: kwargs["libc"] = select({ - "//conditions:default": "glibc", "@rules_python//python/config_settings:_is_py_linux_libc_glibc": "glibc", "@rules_python//python/config_settings:_is_py_linux_libc_musl": "musl", + "//conditions:default": "glibc", }) # 6. Wrap with py_extension_wrapper for PEP 3149 naming & PyInfo diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index a504a49b4d..86fd801ace 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -65,16 +65,16 @@ def _py_extension_wrapper_impl(ctx): ] PY_EXTENSION_WRAPPER_ATTRS = COMMON_ATTRS | { - "src": lambda: attrb.Label( - mandatory = True, - providers = [CcSharedLibraryInfo], - doc = "The cc_shared_library target to wrap.", - ), "libc": lambda: attrb.String(default = "glibc"), "module_name": lambda: attrb.String(), "py_limited_api": lambda: attrb.String( default = "", ), + "src": lambda: attrb.Label( + mandatory = True, + providers = [CcSharedLibraryInfo], + doc = "The cc_shared_library target to wrap.", + ), "_constraints": lambda: attrb.LabelList( default = sorted({ c: None diff --git a/tests/cc/py_extension/dependency_graph_tests.bzl b/tests/cc/py_extension/dependency_graph_tests.bzl index be82931c98..bdfaa86865 100644 --- a/tests/cc/py_extension/dependency_graph_tests.bzl +++ b/tests/cc/py_extension/dependency_graph_tests.bzl @@ -78,7 +78,7 @@ def _csl_dynamic_deps_test_impl(env, target): csl_info = target[CcSharedLibraryInfo] # Derive labels - test_name = target.label.name[:-5] # remove "_cslA" + test_name = target.label.name[:-5] # remove "_cslA" libA_label = target.label.same_package_label(test_name + "_libA") libB_label = target.label.same_package_label(test_name + "_libB") libC_label = target.label.same_package_label(test_name + "_libC") @@ -124,7 +124,7 @@ def _cslC_deps_test_impl(env, target): csl_info = target[CcSharedLibraryInfo] # Derive labels - test_name = target.label.name[:-5] # remove "_cslC" + test_name = target.label.name[:-5] # remove "_cslC" libC_label = target.label.same_package_label(test_name + "_libC") env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libC_label)]) @@ -136,7 +136,7 @@ def _cslB_deps_test_impl(env, target): csl_info = target[CcSharedLibraryInfo] # Derive labels - test_name = target.label.name[:-5] # remove "_cslB" + test_name = target.label.name[:-5] # remove "_cslB" libB_label = target.label.same_package_label(test_name + "_libB") libC_label = target.label.same_package_label(test_name + "_libC") cslC_label = target.label.same_package_label(test_name + "_cslC") @@ -156,7 +156,7 @@ def _pyext_dynamic_deps_test_impl(env, target): csl_info = target[CcSharedLibraryInfo] # Derive labels - test_name = target.label.name[:-7] # remove "_pyextA" + test_name = target.label.name[:-7] # remove "_pyextA" libA_label = target.label.same_package_label(test_name + "_libA") libB_label = target.label.same_package_label(test_name + "_libB") libC_label = target.label.same_package_label(test_name + "_libC") @@ -218,7 +218,7 @@ def _csl_static_sharing_test_impl(env, target): csl_info = target[CcSharedLibraryInfo] # Derive labels - test_name = target.label.name[:-5] # remove "_cslA" + test_name = target.label.name[:-5] # remove "_cslA" libA_label = target.label.same_package_label(test_name + "_libA") libB_label = target.label.same_package_label(test_name + "_libB") libC_label = target.label.same_package_label(test_name + "_libC") @@ -256,7 +256,7 @@ def _cslB_static_sharing_test_impl(env, target): csl_info = target[CcSharedLibraryInfo] # Derive labels - test_name = target.label.name[:-5] # remove "_cslB" + test_name = target.label.name[:-5] # remove "_cslB" libB_label = target.label.same_package_label(test_name + "_libB") libC_label = target.label.same_package_label(test_name + "_libC") @@ -270,7 +270,7 @@ def _pyext_static_sharing_test_impl(env, target): csl_info = target[CcSharedLibraryInfo] # Derive labels - test_name = target.label.name[:-7] # remove "_pyextA" + test_name = target.label.name[:-7] # remove "_pyextA" libA_label = target.label.same_package_label(test_name + "_libA") libB_label = target.label.same_package_label(test_name + "_libB") libC_label = target.label.same_package_label(test_name + "_libC") From b1589755a691a98e91e4616e9ffd98e5615b2b22 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Tue, 7 Jul 2026 20:36:24 +0000 Subject: [PATCH 37/42] Address buildifier and buildifier-lint warnings. --- python/private/cc/py_extension_macro.bzl | 4 + .../py_extension/dependency_graph_tests.bzl | 88 +++++++++---------- tests/cc/py_extension/py_extension_tests.bzl | 4 +- 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/python/private/cc/py_extension_macro.bzl b/python/private/cc/py_extension_macro.bzl index ea25f92bb8..3a5aa0d72f 100644 --- a/python/private/cc/py_extension_macro.bzl +++ b/python/private/cc/py_extension_macro.bzl @@ -16,6 +16,7 @@ def py_extension( exports_filter = None, user_link_flags = None, visibility = None, + data = None, **kwargs): """Creates a Python extension module. @@ -83,6 +84,9 @@ def py_extension( "//conditions:default": "glibc", }) + if data != None: + kwargs["data"] = data + # 6. Wrap with py_extension_wrapper for PEP 3149 naming & PyInfo py_extension_wrapper( name = name, diff --git a/tests/cc/py_extension/dependency_graph_tests.bzl b/tests/cc/py_extension/dependency_graph_tests.bzl index bdfaa86865..16ee883465 100644 --- a/tests/cc/py_extension/dependency_graph_tests.bzl +++ b/tests/cc/py_extension/dependency_graph_tests.bzl @@ -79,15 +79,15 @@ def _csl_dynamic_deps_test_impl(env, target): # Derive labels test_name = target.label.name[:-5] # remove "_cslA" - libA_label = target.label.same_package_label(test_name + "_libA") - libB_label = target.label.same_package_label(test_name + "_libB") - libC_label = target.label.same_package_label(test_name + "_libC") + lib_a_label = target.label.same_package_label(test_name + "_libA") + lib_b_label = target.label.same_package_label(test_name + "_libB") + lib_c_label = target.label.same_package_label(test_name + "_libC") - env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libA_label)]) + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(lib_a_label)]) if hasattr(csl_info, "link_once_static_libs"): - static_libs = [str(l) for l in csl_info.link_once_static_libs] - env.expect.that_collection(static_libs).contains(str(libA_label)) - env.expect.that_collection(static_libs).contains_none_of([str(libB_label), str(libC_label)]) + static_libs = [str(lbl) for lbl in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(lib_a_label)) + env.expect.that_collection(static_libs).contains_none_of([str(lib_b_label), str(lib_c_label)]) # Test 2: py_extension A -> CSL B -> CSL C (Dynamic deps) def _test_pyext_dynamic_deps_top(name): @@ -125,11 +125,11 @@ def _cslC_deps_test_impl(env, target): # Derive labels test_name = target.label.name[:-5] # remove "_cslC" - libC_label = target.label.same_package_label(test_name + "_libC") + lib_c_label = target.label.same_package_label(test_name + "_libC") - env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libC_label)]) + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(lib_c_label)]) if hasattr(csl_info, "link_once_static_libs"): - env.expect.that_collection([str(l) for l in csl_info.link_once_static_libs]).contains_exactly([str(libC_label)]) + env.expect.that_collection([str(lbl) for lbl in csl_info.link_once_static_libs]).contains_exactly([str(lib_c_label)]) def _cslB_deps_test_impl(env, target): env.expect.that_target(target).has_provider(CcSharedLibraryInfo) @@ -137,19 +137,19 @@ def _cslB_deps_test_impl(env, target): # Derive labels test_name = target.label.name[:-5] # remove "_cslB" - libB_label = target.label.same_package_label(test_name + "_libB") - libC_label = target.label.same_package_label(test_name + "_libC") - cslC_label = target.label.same_package_label(test_name + "_cslC") + lib_b_label = target.label.same_package_label(test_name + "_libB") + lib_c_label = target.label.same_package_label(test_name + "_libC") + csl_c_label = target.label.same_package_label(test_name + "_cslC") - env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libB_label)]) + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(lib_b_label)]) if hasattr(csl_info, "link_once_static_libs"): - static_libs = [str(l) for l in csl_info.link_once_static_libs] - env.expect.that_collection(static_libs).contains(str(libB_label)) - env.expect.that_collection(static_libs).contains_none_of([str(libC_label)]) + static_libs = [str(lbl) for lbl in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(lib_b_label)) + env.expect.that_collection(static_libs).contains_none_of([str(lib_c_label)]) if hasattr(csl_info, "dynamic_deps"): dynamic_deps = [str(d.linker_input.owner) for d in csl_info.dynamic_deps.to_list()] - env.expect.that_collection(dynamic_deps).contains(str(cslC_label)) + env.expect.that_collection(dynamic_deps).contains(str(csl_c_label)) def _pyext_dynamic_deps_test_impl(env, target): env.expect.that_target(target).has_provider(CcSharedLibraryInfo) @@ -157,15 +157,15 @@ def _pyext_dynamic_deps_test_impl(env, target): # Derive labels test_name = target.label.name[:-7] # remove "_pyextA" - libA_label = target.label.same_package_label(test_name + "_libA") - libB_label = target.label.same_package_label(test_name + "_libB") - libC_label = target.label.same_package_label(test_name + "_libC") + lib_a_label = target.label.same_package_label(test_name + "_libA") + lib_b_label = target.label.same_package_label(test_name + "_libB") + lib_c_label = target.label.same_package_label(test_name + "_libC") - env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libA_label)]) + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(lib_a_label)]) if hasattr(csl_info, "link_once_static_libs"): - static_libs = [str(l) for l in csl_info.link_once_static_libs] - env.expect.that_collection(static_libs).contains(str(libA_label)) - env.expect.that_collection(static_libs).contains_none_of([str(libB_label), str(libC_label)]) + static_libs = [str(lbl) for lbl in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(lib_a_label)) + env.expect.that_collection(static_libs).contains_none_of([str(lib_b_label), str(lib_c_label)]) # For tests 3 and 4 def _create_static_sharing_helpers(name): @@ -219,15 +219,15 @@ def _csl_static_sharing_test_impl(env, target): # Derive labels test_name = target.label.name[:-5] # remove "_cslA" - libA_label = target.label.same_package_label(test_name + "_libA") - libB_label = target.label.same_package_label(test_name + "_libB") - libC_label = target.label.same_package_label(test_name + "_libC") + lib_a_label = target.label.same_package_label(test_name + "_libA") + lib_b_label = target.label.same_package_label(test_name + "_libB") + lib_c_label = target.label.same_package_label(test_name + "_libC") - env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libA_label)]) + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(lib_a_label)]) if hasattr(csl_info, "link_once_static_libs"): - static_libs = [str(l) for l in csl_info.link_once_static_libs] - env.expect.that_collection(static_libs).contains(str(libA_label)) - env.expect.that_collection(static_libs).contains_none_of([str(libB_label), str(libC_label)]) + static_libs = [str(lbl) for lbl in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(lib_a_label)) + env.expect.that_collection(static_libs).contains_none_of([str(lib_b_label), str(lib_c_label)]) # Test 4: Same as 3, but A is py_extension def _test_pyext_static_sharing_top(name): @@ -257,13 +257,13 @@ def _cslB_static_sharing_test_impl(env, target): # Derive labels test_name = target.label.name[:-5] # remove "_cslB" - libB_label = target.label.same_package_label(test_name + "_libB") - libC_label = target.label.same_package_label(test_name + "_libC") + lib_b_label = target.label.same_package_label(test_name + "_libB") + lib_c_label = target.label.same_package_label(test_name + "_libC") - env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libB_label), str(libC_label)]) + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(lib_b_label), str(lib_c_label)]) if hasattr(csl_info, "link_once_static_libs"): - static_libs = [str(l) for l in csl_info.link_once_static_libs] - env.expect.that_collection(static_libs).contains_exactly([str(libB_label), str(libC_label)]) + static_libs = [str(lbl) for lbl in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains_exactly([str(lib_b_label), str(lib_c_label)]) def _pyext_static_sharing_test_impl(env, target): env.expect.that_target(target).has_provider(CcSharedLibraryInfo) @@ -271,15 +271,15 @@ def _pyext_static_sharing_test_impl(env, target): # Derive labels test_name = target.label.name[:-7] # remove "_pyextA" - libA_label = target.label.same_package_label(test_name + "_libA") - libB_label = target.label.same_package_label(test_name + "_libB") - libC_label = target.label.same_package_label(test_name + "_libC") + lib_a_label = target.label.same_package_label(test_name + "_libA") + lib_b_label = target.label.same_package_label(test_name + "_libB") + lib_c_label = target.label.same_package_label(test_name + "_libC") - env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(libA_label)]) + env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(lib_a_label)]) if hasattr(csl_info, "link_once_static_libs"): - static_libs = [str(l) for l in csl_info.link_once_static_libs] - env.expect.that_collection(static_libs).contains(str(libA_label)) - env.expect.that_collection(static_libs).contains_none_of([str(libB_label), str(libC_label)]) + static_libs = [str(lbl) for lbl in csl_info.link_once_static_libs] + env.expect.that_collection(static_libs).contains(str(lib_a_label)) + env.expect.that_collection(static_libs).contains_none_of([str(lib_b_label), str(lib_c_label)]) def dependency_graph_test_suite(name): test_suite( diff --git a/tests/cc/py_extension/py_extension_tests.bzl b/tests/cc/py_extension/py_extension_tests.bzl index b21880f83f..13fb4e9e0c 100644 --- a/tests/cc/py_extension/py_extension_tests.bzl +++ b/tests/cc/py_extension/py_extension_tests.bzl @@ -17,7 +17,7 @@ load("@rules_cc//cc/common:cc_shared_library_info.bzl", "CcSharedLibraryInfo") load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") load("@rules_testing//lib:truth.bzl", "matching") -load("//python/private:py_info.bzl", "PyInfo") +load("//python/private:py_info.bzl", "PyInfo") # buildifier: disable=bzl-visibility _tests = [] @@ -43,7 +43,6 @@ _tests.append(_test_static_deps) def _test_data_deps_impl(env, target): env.expect.that_target(target).has_provider(PyInfo) - py_info = target[PyInfo] env.expect.that_target(target).has_provider(CcSharedLibraryInfo) # Check that data file is in runfiles @@ -65,7 +64,6 @@ def _test_dynamic_deps_impl(env, target): env.expect.that_target(target).has_provider(PyInfo) py_info = target[PyInfo] env.expect.that_target(target).has_provider(CcSharedLibraryInfo) - csl_info = target[CcSharedLibraryInfo] # The .so should be in PyInfo env.expect.that_collection(py_info.transitive_sources.to_list()).has_size(1) From 6e1763e6793a1e8ca4e415f2bcf91895a97c0d3d Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Thu, 9 Jul 2026 20:31:35 +0000 Subject: [PATCH 38/42] Use text instead of code file for data. --- tests/cc/py_extension/BUILD.bazel | 2 +- tests/cc/py_extension/some_data.txt | 1 + tests/cc/py_extension/test_symbols.h | 8 -------- 3 files changed, 2 insertions(+), 9 deletions(-) create mode 100644 tests/cc/py_extension/some_data.txt delete mode 100644 tests/cc/py_extension/test_symbols.h diff --git a/tests/cc/py_extension/BUILD.bazel b/tests/cc/py_extension/BUILD.bazel index 65d37b73da..8c49343db6 100644 --- a/tests/cc/py_extension/BUILD.bazel +++ b/tests/cc/py_extension/BUILD.bazel @@ -42,7 +42,7 @@ cc_library( py_extension( # An extension that also depends on a data file name = "ext_with_data", - data = ["test_symbols.h"], + data = ["some_data.txt"], deps = [":static_dep"], ) diff --git a/tests/cc/py_extension/some_data.txt b/tests/cc/py_extension/some_data.txt new file mode 100644 index 0000000000..4b5dc1d64c --- /dev/null +++ b/tests/cc/py_extension/some_data.txt @@ -0,0 +1 @@ +This is a data file diff --git a/tests/cc/py_extension/test_symbols.h b/tests/cc/py_extension/test_symbols.h deleted file mode 100644 index 59ab3b02e7..0000000000 --- a/tests/cc/py_extension/test_symbols.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef TEST_SYMBOLS_H -#define TEST_SYMBOLS_H - -void fnC(); -void fnB(); -void fnA(); - -#endif // TEST_SYMBOLS_H From d324300b736f8207c234454eac923bfd45ff2ad9 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Thu, 9 Jul 2026 20:40:31 +0000 Subject: [PATCH 39/42] Ignore unusual edge case. --- tests/cc/py_extension/BUILD.bazel | 21 ------------------- .../cc/py_extension/ext_init_in_dynamic_dep.c | 20 ------------------ 2 files changed, 41 deletions(-) delete mode 100644 tests/cc/py_extension/ext_init_in_dynamic_dep.c diff --git a/tests/cc/py_extension/BUILD.bazel b/tests/cc/py_extension/BUILD.bazel index 8c49343db6..3903d30537 100644 --- a/tests/cc/py_extension/BUILD.bazel +++ b/tests/cc/py_extension/BUILD.bazel @@ -142,27 +142,6 @@ cc_library( ##### -py_extension( - # An extension with its PyInit_* function in a dynamic dependency - name = "ext_init_in_dynamic_dep", - dynamic_deps = [":ext_init_in_dynamic_dep_2"], -) - -cc_shared_library( - name = "ext_init_in_dynamic_dep_2", - deps = [":ext_init_in_dynamic_dep_impl"], -) - -cc_library( - name = "ext_init_in_dynamic_dep_impl", - srcs = ["ext_init_in_dynamic_dep.c"], - deps = [ - "@rules_python//python/cc:current_py_cc_headers", - ], -) - -##### - py_test( name = "py_extension_test", srcs = ["py_extension_test.py"], diff --git a/tests/cc/py_extension/ext_init_in_dynamic_dep.c b/tests/cc/py_extension/ext_init_in_dynamic_dep.c deleted file mode 100644 index ad196adb06..0000000000 --- a/tests/cc/py_extension/ext_init_in_dynamic_dep.c +++ /dev/null @@ -1,20 +0,0 @@ - -#include - -// No methods defined; we're just testing the init function. -static PyMethodDef ModuleMethods[] = { - {NULL, NULL, 0, NULL} /* Sentinel */ -}; - -static struct PyModuleDef ext_init_in_dynamic_dep_module = { - PyModuleDef_HEAD_INIT, - "ext_init_in_dynamic_dep", /* name of module */ - NULL, /* module documentation, may be NULL */ - -1, /* size of per-interpreter state of the module, - or -1 if the module keeps state in global variables. */ - ModuleMethods -}; - -PyMODINIT_FUNC PyInit_ext_init_in_dynamic_dep(void) { - return PyModule_Create(&ext_init_in_dynamic_dep_module); -} From 0f4edda0cf664c1cfba8f921ab816ce3d771626c Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Thu, 9 Jul 2026 20:44:18 +0000 Subject: [PATCH 40/42] Restore missing file. --- tests/cc/py_extension/test_symbols.h | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tests/cc/py_extension/test_symbols.h diff --git a/tests/cc/py_extension/test_symbols.h b/tests/cc/py_extension/test_symbols.h new file mode 100644 index 0000000000..59ab3b02e7 --- /dev/null +++ b/tests/cc/py_extension/test_symbols.h @@ -0,0 +1,8 @@ +#ifndef TEST_SYMBOLS_H +#define TEST_SYMBOLS_H + +void fnC(); +void fnB(); +void fnA(); + +#endif // TEST_SYMBOLS_H From bae75f780c97686497bff79ec6d9cccfc6926366 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Fri, 10 Jul 2026 18:31:29 +0000 Subject: [PATCH 41/42] Remove the CcSharedLibraryInfo provider for now. --- python/private/cc/py_extension_rule.bzl | 3 +- .../py_extension/dependency_graph_tests.bzl | 60 ------------------- 2 files changed, 1 insertion(+), 62 deletions(-) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 86fd801ace..7736985111 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -61,7 +61,6 @@ def _py_extension_wrapper_impl(ctx): transitive_sources = depset([py_dso]), imports = depset([import_path]), ), - csl_target[CcSharedLibraryInfo], ] PY_EXTENSION_WRAPPER_ATTRS = COMMON_ATTRS | { @@ -89,7 +88,7 @@ def create_py_extension_wrapper_rule_builder(**kwargs): builder = ruleb.Rule( implementation = _py_extension_wrapper_impl, attrs = PY_EXTENSION_WRAPPER_ATTRS, - provides = [PyInfo, CcSharedLibraryInfo], + provides = [PyInfo], toolchains = [ ruleb.ToolchainType(PY_CC_TOOLCHAIN_TYPE), ruleb.ToolchainType("@bazel_tools//tools/cpp:toolchain_type"), diff --git a/tests/cc/py_extension/dependency_graph_tests.bzl b/tests/cc/py_extension/dependency_graph_tests.bzl index 16ee883465..497571e128 100644 --- a/tests/cc/py_extension/dependency_graph_tests.bzl +++ b/tests/cc/py_extension/dependency_graph_tests.bzl @@ -19,7 +19,6 @@ load("@rules_cc//cc:cc_shared_library.bzl", "cc_shared_library") load("@rules_cc//cc/common:cc_shared_library_info.bzl", "CcSharedLibraryInfo") load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite") load("@rules_testing//lib:util.bzl", "util") -load("//python/cc:py_extension.bzl", "py_extension") # For tests 1 and 2 def _create_dynamic_deps_helpers(name): @@ -90,19 +89,6 @@ def _csl_dynamic_deps_test_impl(env, target): env.expect.that_collection(static_libs).contains_none_of([str(lib_b_label), str(lib_c_label)]) # Test 2: py_extension A -> CSL B -> CSL C (Dynamic deps) -def _test_pyext_dynamic_deps_top(name): - _create_dynamic_deps_helpers(name) - py_extension( - name = name + "_pyextA", - deps = [":" + name + "_libA"], - dynamic_deps = [":" + name + "_cslB", ":" + name + "_cslC"], - ) - analysis_test( - name = name, - target = name + "_pyextA", - impl = _pyext_dynamic_deps_test_impl, - ) - def _test_pyext_dynamic_deps_cslB(name): _create_dynamic_deps_helpers(name) analysis_test( @@ -151,22 +137,6 @@ def _cslB_deps_test_impl(env, target): dynamic_deps = [str(d.linker_input.owner) for d in csl_info.dynamic_deps.to_list()] env.expect.that_collection(dynamic_deps).contains(str(csl_c_label)) -def _pyext_dynamic_deps_test_impl(env, target): - env.expect.that_target(target).has_provider(CcSharedLibraryInfo) - csl_info = target[CcSharedLibraryInfo] - - # Derive labels - test_name = target.label.name[:-7] # remove "_pyextA" - lib_a_label = target.label.same_package_label(test_name + "_libA") - lib_b_label = target.label.same_package_label(test_name + "_libB") - lib_c_label = target.label.same_package_label(test_name + "_libC") - - env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(lib_a_label)]) - if hasattr(csl_info, "link_once_static_libs"): - static_libs = [str(lbl) for lbl in csl_info.link_once_static_libs] - env.expect.that_collection(static_libs).contains(str(lib_a_label)) - env.expect.that_collection(static_libs).contains_none_of([str(lib_b_label), str(lib_c_label)]) - # For tests 3 and 4 def _create_static_sharing_helpers(name): util.helper_target( @@ -230,18 +200,6 @@ def _csl_static_sharing_test_impl(env, target): env.expect.that_collection(static_libs).contains_none_of([str(lib_b_label), str(lib_c_label)]) # Test 4: Same as 3, but A is py_extension -def _test_pyext_static_sharing_top(name): - _create_static_sharing_helpers(name) - py_extension( - name = name + "_pyextA", - deps = [":" + name + "_libA"], - dynamic_deps = [":" + name + "_cslB"], - ) - analysis_test( - name = name, - target = name + "_pyextA", - impl = _pyext_static_sharing_test_impl, - ) def _test_pyext_static_sharing_cslB(name): _create_static_sharing_helpers(name) @@ -265,32 +223,14 @@ def _cslB_static_sharing_test_impl(env, target): static_libs = [str(lbl) for lbl in csl_info.link_once_static_libs] env.expect.that_collection(static_libs).contains_exactly([str(lib_b_label), str(lib_c_label)]) -def _pyext_static_sharing_test_impl(env, target): - env.expect.that_target(target).has_provider(CcSharedLibraryInfo) - csl_info = target[CcSharedLibraryInfo] - - # Derive labels - test_name = target.label.name[:-7] # remove "_pyextA" - lib_a_label = target.label.same_package_label(test_name + "_libA") - lib_b_label = target.label.same_package_label(test_name + "_libB") - lib_c_label = target.label.same_package_label(test_name + "_libC") - - env.expect.that_collection([str(e) for e in csl_info.exports]).contains_exactly([str(lib_a_label)]) - if hasattr(csl_info, "link_once_static_libs"): - static_libs = [str(lbl) for lbl in csl_info.link_once_static_libs] - env.expect.that_collection(static_libs).contains(str(lib_a_label)) - env.expect.that_collection(static_libs).contains_none_of([str(lib_b_label), str(lib_c_label)]) - def dependency_graph_test_suite(name): test_suite( name = name, tests = [ _test_csl_dynamic_deps_top, - _test_pyext_dynamic_deps_top, _test_pyext_dynamic_deps_cslB, _test_pyext_dynamic_deps_cslC, _test_csl_static_sharing_top, - _test_pyext_static_sharing_top, _test_pyext_static_sharing_cslB, ], ) From b7f81121de8f509a958443515f47ba6b01d88d06 Mon Sep 17 00:00:00 2001 From: Richard Sartor Date: Fri, 10 Jul 2026 22:11:40 +0000 Subject: [PATCH 42/42] Calculate the platform tag from the constraints directly, instead of using the obsolete PLATFORMS global. --- python/private/cc/py_extension_macro.bzl | 12 +++ python/private/cc/py_extension_rule.bzl | 97 +++++++----------------- 2 files changed, 38 insertions(+), 71 deletions(-) diff --git a/python/private/cc/py_extension_macro.bzl b/python/private/cc/py_extension_macro.bzl index 3a5aa0d72f..715ae5e3b6 100644 --- a/python/private/cc/py_extension_macro.bzl +++ b/python/private/cc/py_extension_macro.bzl @@ -92,5 +92,17 @@ def py_extension( name = name, src = ":" + csl_name, visibility = visibility, + os = select({ + "@platforms//os:linux": "linux", + "@platforms//os:macos": "macos", + "@platforms//os:windows": "windows", + "//conditions:default": "unknown", + }), + cpu = select({ + "@platforms//cpu:x86_64": "x86_64", + "@platforms//cpu:aarch64": "aarch64", + "@platforms//cpu:x86_32": "x86_32", + "//conditions:default": "unknown", + }), **kwargs ) diff --git a/python/private/cc/py_extension_rule.bzl b/python/private/cc/py_extension_rule.bzl index 7736985111..744d090c09 100644 --- a/python/private/cc/py_extension_rule.bzl +++ b/python/private/cc/py_extension_rule.bzl @@ -74,13 +74,8 @@ PY_EXTENSION_WRAPPER_ATTRS = COMMON_ATTRS | { providers = [CcSharedLibraryInfo], doc = "The cc_shared_library target to wrap.", ), - "_constraints": lambda: attrb.LabelList( - default = sorted({ - c: None - for info in PLATFORMS.values() - for c in info.compatible_with - }.keys()), - ), + "os": lambda: attrb.String(doc = "OS determined by macro select."), + "cpu": lambda: attrb.String(doc = "CPU determined by macro select."), } def create_py_extension_wrapper_rule_builder(**kwargs): @@ -118,69 +113,16 @@ def _get_extension(cc_toolchain): ext = "pyd" if is_windows else "so" return ext -def _derive_pep3149_tag(platform, info): - # platform is the triplet, e.g. "x86_64-unknown-linux-gnu" - p, _, _ = platform.partition("-freethreaded") - parts = p.split("-") - triplet_arch = parts[0] - - if info.os_name == "windows": - if triplet_arch == "x86_64": - return "win_amd64" - elif triplet_arch == "aarch64": - return "win_arm64" - else: - return "win32" - elif info.os_name == "osx": - return "darwin" - elif info.os_name == "linux": - abi = "musl" if p.endswith("-musl") else "gnu" - return "{}-linux-{}".format(triplet_arch, abi) - else: - return triplet_arch - -def _get_platform_from_constraints(ctx): - # Build a map of Label to ConstraintValueInfo from _constraints - constraints_map = {} - for c in ctx.attr._constraints: - if platform_common.ConstraintValueInfo in c: - constraints_map[c.label] = c[platform_common.ConstraintValueInfo] - - # Resolve the target's libc to its config_setting label string - target_libc_setting = None - if ctx.attr.libc == "musl": - target_libc_setting = str(Label("//python/config_settings:_is_py_linux_libc_musl")) - elif ctx.attr.libc == "glibc": - target_libc_setting = str(Label("//python/config_settings:_is_py_linux_libc_glibc")) - - # Find the matching platform in PLATFORMS - for platform, info in PLATFORMS.items(): - # Check if all compatible_with constraints are satisfied - match = True - for c_str in info.compatible_with: - c_label = Label(c_str) - if c_label in constraints_map: - c_val = constraints_map[c_label] - if not ctx.target_platform_has_constraint(c_val): - match = False - break - else: - match = False - break - - if match: - # Additional check for Linux libc consistency using target_settings - if info.os_name == "linux" and target_libc_setting: - if target_libc_setting not in info.target_settings: - match = False - - if match: - return _derive_pep3149_tag(platform, info) - - return None - def _get_platform(ctx): """Derives the PEP 3149 platform tag from the target constraints. + Linux platform tags are standardized here: + - https://peps.python.org/pep-3149/ + Windows platform tags, such as they are, are defined in this issue and + commit (treated as a de facto standard): + - https://github.com/python/cpython/issues/67169 + - https://github.com/python/cpython/commit/03a144bb6ac3d7631a3bdb895e2a1f2d021fb08b + Apple platform tag is always just "darwin", discussed briefly here: + - https://github.com/python/cpython/commit/3b8124884c3655b4cf2629d741b18c1a38181805 Args: ctx: The rule context. @@ -188,9 +130,22 @@ def _get_platform(ctx): Returns: The platform tag, e.g. "x86_64-linux-gnu" or "win_amd64" """ - platform_tag = _get_platform_from_constraints(ctx) - if platform_tag: - return platform_tag + os = ctx.attr.os + cpu = ctx.attr.cpu + + if os == "windows": + if cpu == "x86_64": + return "win_amd64" + if cpu == "aarch64": + return "win_arm64" + return "win32" + if os == "macos": + return "darwin" + if os == "linux": + libc = "gnu" + if ctx.attr.libc == "musl": + libc = "musl" + return '{}-{}-{}'.format(cpu, os, libc) fail( """