Skip to content

Commit 04d0446

Browse files
committed
BUG: Fix venv_paths tuple unpacking after python_sabi_library addition
All call sites that unpack venv_paths() now include the new python_sabi_library element. Also fix windows_build_module_wheels.py to pass python_sabi_library (not python_library) for Python3_SABI_LIBRARY. Update ITK to include Python CMake fixes.
1 parent 6b10b7f commit 04d0446

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ if(ITKPythonPackage_SUPERBUILD)
9494

9595
set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
9696

97-
# release branch, 2026-02-25
98-
set(ITK_GIT_TAG "v6.0b02")
97+
# release branch, 2026-03-10
98+
set(ITK_GIT_TAG "c6e1c1be6a86236cbb812bd71eec5a4df9b1353c")
9999

100100
#-----------------------------------------------------------------------------
101101
# A separate project is used to download ITK, so that it can reused

scripts/windows_build_module_wheels.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def build_wheels(py_envs=DEFAULT_PY_ENVS, cleanup=True, cmake_options=[]):
4444
python_executable,
4545
python_include_dir,
4646
python_library,
47+
python_sabi_library,
4748
pip,
4849
ninja_executable,
4950
path,
@@ -116,7 +117,7 @@ def build_wheels(py_envs=DEFAULT_PY_ENVS, cleanup=True, cmake_options=[]):
116117
"--config-setting=cmake.define.Python3_LIBRARY:FILEPATH=%s"
117118
% python_library,
118119
"--config-setting=cmake.define.Python3_SABI_LIBRARY:FILEPATH=%s"
119-
% python_library,
120+
% python_sabi_library,
120121
]
121122
+ [
122123
o.replace("-D", "--config-setting=cmake.define.")
@@ -174,6 +175,7 @@ def rename_wheel_init(py_env, filepath, add_module_name=True):
174175
python_executable,
175176
python_include_dir,
176177
python_library,
178+
python_sabi_library,
177179
pip,
178180
ninja_executable,
179181
path,

scripts/windows_build_wheels.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ def test_wheels(python_env):
298298
python_executable,
299299
python_include_dir,
300300
python_library,
301+
python_sabi_library,
301302
pip,
302303
ninja_executable,
303304
path,

0 commit comments

Comments
 (0)