Merge branch 'master' into release

Author: thewtex

requirements-dev.txt

@@ -1,5 +1,6 @@
 ninja==1.11.1.1
-scikit-build-core==0.8.2
+scikit-build-core==0.9.5
 build==1.2.1
 pyproject-metadata
 pathspec
+setuptools_scm==8.1.0

scripts/dockcross-manylinux-build-module-deps.sh

@@ -74,7 +74,7 @@ for MODULE_INFO in ${ITK_MODULE_PREQ_TOPLEVEL//:/ }; do
 
   echo "Cleaning up module dependency"
   cp ./${MODULE_NAME}/include/* include/
-  find ${MODULE_NAME}/_skbuild -type f -wholename "**/cmake-build/include/*" -print -exec cp {} include \;
+  find ${MODULE_NAME}/*build/*/include -type f -print -exec cp {} include \;
 
   # Cache build archive
   if [[ `(compgen -G ./ITKPythonBuilds-linux*.tar.zst)` ]]; then

scripts/dockcross-manylinux-cleanup.sh

@@ -31,7 +31,7 @@ fi
 unlink oneTBB-prefix
 ${rm_prefix} rm -rf ITKPythonPackage/
 ${rm_prefix} rm -rf tools/
-${rm_prefix} rm -rf _skbuild/
+${rm_prefix} rm -rf _skbuild/ build/
 ${rm_prefix} rm -rf ./*.egg-info/
 ${rm_prefix} rm -rf ./ITK-*-manylinux${MANYLINUX_VERSION}_${TARGET_ARCH}/
 ${rm_prefix} rm -rf ./ITKPythonBuilds-linux-manylinux*${MANYLINUX_VERSION}*.tar.zst

scripts/internal/manylinux-build-module-wheels.sh

@@ -95,7 +95,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
 
     if [[ -e /work/requirements-dev.txt ]]; then
       ${PYBIN}/pip install --upgrade -r /work/requirements-dev.txt
-    elif [[ -e /ITKPythonPackage/requirements-dev.txt ]]; then
+    fi
+    if [[ -e /ITKPythonPackage/requirements-dev.txt ]]; then
       ${PYBIN}/pip install --upgrade -r /ITKPythonPackage/requirements-dev.txt
     fi
     version=$(basename $(dirname ${PYBIN}))

scripts/macpython-download-cache-and-build-module-wheels.sh

@@ -39,8 +39,8 @@
 
 # Install dependencies
 brew update
-brew install zstd aria2 gnu-tar doxygen ninja
-brew upgrade cmake
+brew install --quiet zstd aria2 gnu-tar doxygen ninja
+brew upgrade --quiet cmake
 
 if [[ $(arch) == "arm64" ]]; then
   tarball_arch="-arm64"

scripts/pyproject.toml.in

@@ -127,7 +127,7 @@ install.components = []
 install.strip = true
 
 # If set, this will provide a method for backward compatibility.
-minimum-version = "0.8.2"
+minimum-version = "0.9.5"
 
 # The build directory. Defaults to a temporary directory, but can be set.
 build-dir = "build/{wheel_tag}"

scripts/windows_build_module_wheels.py

@@ -86,6 +86,9 @@ def build_wheels(py_envs=DEFAULT_PY_ENVS, cleanup=True, cmake_options=[]):
                     "--config-setting=wheel.py-api=%s" % wheel_py_api,
                     "--config-setting=cmake.define.SKBUILD:BOOL=ON",
                     "--config-setting=cmake.define.PY_SITE_PACKAGES_PATH:PATH=.",
+                    "--config-setting=cmake.args=""-G Ninja""",
+                    "--config-setting=cmake.define.CMAKE_BUILD_TYPE:STRING=""Release""",
+                    "--config-setting=cmake.define.CMAKE_MAKE_PROGRAM:FILEPATH=%s" % ninja_executable,
                     "--config-setting=cmake.define.ITK_DIR:PATH=%s" % itk_build_path,
                     "--config-setting=cmake.define.WRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel",
                     "--config-setting=cmake.define.SWIG_EXECUTABLE:FILEPATH=%s/Wrapping/Generators/SwigInterface/swig/bin/swig.exe" % itk_build_path,