Merge branch 'main' into fix_dependency_resolver_on_windows

Author: aignas

CHANGELOG.md

@@ -97,6 +97,9 @@ Other changes:
   hardcoded in Bazel, WORKSPACE mode.
 * (pypi): {bzl:obj}`compile_pip_requirements` no longer fails on Windows when `--enable_runfiles` is not enabled.
 * (pypi): {bzl:obj}`compile_pip_requirements` now correctly updates files in the source tree on Windows when `--windows_enable_symlinks` is not enabled.
+* (repositories): Add libs/python3.lib and pythonXY.dll to the `libpython` target
+  defined by a repository template. This enables stable ABI builds of Python extensions
+  on Windows (by defining Py_LIMITED_API).
 
 {#v0-0-0-added}
 ### Added

python/private/hermetic_runtime_repo_setup.bzl

@@ -89,6 +89,14 @@ def define_hermetic_runtime_toolchain_impl(
         }),
         system_provided = True,
     )
+    cc_import(
+        name = "abi3_interface",
+        interface_library = select({
+            _IS_FREETHREADED: "libs/python3t.lib",
+            "//conditions:default": "libs/python3.lib",
+        }),
+        system_provided = True,
+    )
 
     native.filegroup(
         name = "includes",
@@ -97,7 +105,7 @@ def define_hermetic_runtime_toolchain_impl(
     cc_library(
         name = "python_headers",
         deps = select({
-            "@bazel_tools//src/conditions:windows": [":interface"],
+            "@bazel_tools//src/conditions:windows": [":interface", ":abi3_interface"],
             "//conditions:default": None,
         }),
         hdrs = [":includes"],
@@ -156,15 +164,22 @@ def define_hermetic_runtime_toolchain_impl(
                 "lib/libpython{major}.{minor}t.dylib".format(**version_dict),
             ],
             ":is_freethreaded_windows": [
-                "python3.dll",
+                "python3t.dll",
+                "python{major}{minor}t.dll".format(**version_dict),
                 "libs/python{major}{minor}t.lib".format(**version_dict),
+                "libs/python3t.lib",
             ],
             "@platforms//os:linux": [
                 "lib/libpython{major}.{minor}.so".format(**version_dict),
                 "lib/libpython{major}.{minor}.so.1.0".format(**version_dict),
             ],
             "@platforms//os:macos": ["lib/libpython{major}.{minor}.dylib".format(**version_dict)],
-            "@platforms//os:windows": ["python3.dll", "libs/python{major}{minor}.lib".format(**version_dict)],
+            "@platforms//os:windows": [
+                "python3.dll",
+                "python{major}{minor}.dll".format(**version_dict),
+                "libs/python{major}{minor}.lib".format(**version_dict),
+                "libs/python3.lib",
+            ],
         }),
     )
 

python/private/pypi/pkg_aliases.bzl

@@ -36,22 +36,31 @@ load(":whl_target_platforms.bzl", "whl_target_platforms")
 # it. It is more of an internal consistency check.
 _VERSION_NONE = (0, 0)
 
+_CONFIG_SETTINGS_PKG = str(Label("//python/config_settings:BUILD.bazel")).partition(":")[0]
+
 _NO_MATCH_ERROR_TEMPLATE = """\
 No matching wheel for current configuration's Python version.
 
 The current build configuration's Python version doesn't match any of the Python
-wheels available for this wheel. This wheel supports the following Python
+wheels available for this distribution. This distribution supports the following Python
 configuration settings:
     {config_settings}
 
 To determine the current configuration's Python version, run:
     `bazel config <config id>` (shown further below)
-and look for
-    {rules_python}//python/config_settings:python_version
 
-If the value is missing, then the "default" Python version is being used,
-which has a "null" version value and will not match version constraints.
-"""
+and look for one of:
+    {settings_pkg}:python_version
+    {settings_pkg}:pip_whl
+    {settings_pkg}:pip_whl_glibc_version
+    {settings_pkg}:pip_whl_muslc_version
+    {settings_pkg}:pip_whl_osx_arch
+    {settings_pkg}:pip_whl_osx_version
+    {settings_pkg}:py_freethreaded
+    {settings_pkg}:py_linux_libc
+
+If the value is missing, then the default value is being used, see documentation:
+{docs_url}/python/config_settings"""
 
 def _no_match_error(actual):
     if type(actual) != type({}):
@@ -68,7 +77,8 @@ def _no_match_error(actual):
                 for value in (key if type(key) == "tuple" else [key])
             ])),
         ).lstrip(),
-        rules_python = "rules_python",
+        settings_pkg = _CONFIG_SETTINGS_PKG,
+        docs_url = "https://rules-python.readthedocs.io/en/latest/api/rules_python",
     )
 
 def pkg_aliases(

tests/cc/current_py_cc_libs/BUILD.bazel

@@ -33,3 +33,21 @@ cc_test(
         "@rules_python//python/cc:current_py_cc_libs",
     ],
 )
+
+# This is technically a headers test, but since the pyconfig.h header
+# designates the appropriate lib to link on Win+MSVC, this test verifies that
+# the expected Windows libraries are all present in the expected location.
+# Since we define the Py_LIMITED_API macro, we expect the linker to go search
+# for libs/python3.lib.
+# buildifier: disable=native-cc
+cc_test(
+    name = "python_libs_linking_windows_test",
+    srcs = ["python_libs_linking_test.cc"],
+    defines = ["Py_LIMITED_API=0x030A0000"],
+    env = {"HELLO": "world"},
+    target_compatible_with = ["@platforms//os:windows"],
+    deps = [
+        "@rules_python//python/cc:current_py_cc_headers",
+        "@rules_python//python/cc:current_py_cc_libs",
+    ],
+)

tests/cc/current_py_cc_libs/python_libs_linking_test.cc

@@ -12,7 +12,7 @@ int main(int argc, char** argv) {
   // To make it actually run, more custom initialization is necessary.
   // See https://docs.python.org/3/c-api/intro.html#embedding-python
   Py_Initialize();
-  PyRun_SimpleString("print('Hello, world')\n");
+  Py_BytesMain(argc, argv);
   Py_Finalize();
   return 0;
 }