[Bf-blender-cvs] [7042f4e4b2e] master: Fix Linux bpy wheel failing to install due to wrong ABI flags

Brecht Van Lommel noreply at git.blender.org
Fri Sep 16 15:53:47 CEST 2022


Commit: 7042f4e4b2e3232da34fadfb83502d090809a211
Author: Brecht Van Lommel
Date:   Fri Sep 16 15:47:51 2022 +0200
Branches: master
https://developer.blender.org/rB7042f4e4b2e3232da34fadfb83502d090809a211

Fix Linux bpy wheel failing to install due to wrong ABI flags

===================================================================

M	build_files/utils/make_bpy_wheel.py

===================================================================

diff --git a/build_files/utils/make_bpy_wheel.py b/build_files/utils/make_bpy_wheel.py
index 900868ea3d7..ba1d0f21937 100755
--- a/build_files/utils/make_bpy_wheel.py
+++ b/build_files/utils/make_bpy_wheel.py
@@ -210,8 +210,10 @@ def main() -> None:
         if f.endswith(".whl"):
             # No apparent way to override this ABI version with setuptools, so rename.
             sys_py = "cp%d%d" % (sys.version_info.major, sys.version_info.minor)
+            sys_py_abi = sys_py + sys.abiflags
             blender_py = "cp%d%d" % (python_version_number[0], python_version_number[1])
-            renamed_f = f.replace(sys_py, blender_py)
+
+            renamed_f = f.replace(sys_py_abi, blender_py).replace(sys_py, blender_py)
 
             os.rename(os.path.join(dist_dir, f), os.path.join(output_dir, renamed_f))



More information about the Bf-blender-cvs mailing list