diff --git a/CMakeLists.txt b/CMakeLists.txt index 454f4b7..29bd907 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,8 +94,8 @@ if(ITKPythonPackage_SUPERBUILD) set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git") - # master branch, 2024-11-13 - set(ITK_GIT_TAG "v6.0a01") + # main branch, 2025-07-16 + set(ITK_GIT_TAG "ff4ff13ec295595cab2edbb3173a39ef798e4c7d") #----------------------------------------------------------------------------- # A separate project is used to download ITK, so that it can reused @@ -120,8 +120,8 @@ if(ITKPythonPackage_SUPERBUILD) endif() ExternalProject_add(oneTBB - URL https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.9.0.tar.gz - URL_HASH SHA256=1ce48f34dada7837f510735ff1172f6e2c261b09460e3bf773b49791d247d24e + URL https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2022.2.0.tar.gz + URL_HASH SHA256=f0f78001c8c8edb4bddc3d4c5ee7428d56ae313254158ad1eec49eced57f6a5b CMAKE_ARGS -DTBB_TEST:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/README.md b/README.md index 882d083..00b039b 100644 --- a/README.md +++ b/README.md @@ -85,8 +85,7 @@ documentation for more information on building wheels by hand. ITKPythonPackage currently supports building wheels for the following platforms and architectures: - Windows 10 x86_64 platforms - Windows 11 x86_64 platforms -- MacOS 10.9+ x86_64 platforms -- MacOS 11.0+ arm64 platforms +- MacOS 15.0+ arm64 platforms - Linux glibc 2.17+ (E.g. Ubuntu 18.04+) x86_64 platforms - Linux glibc 2.28+ (E.g. Ubuntu 20.04+) aarch64 (ARMv8) platforms diff --git a/itkVersion.py b/itkVersion.py index 775f664..10a4a99 100644 --- a/itkVersion.py +++ b/itkVersion.py @@ -1,4 +1,4 @@ -VERSION = '6.0a1' +VERSION = '6.0b1' def get_versions(): """Returns versions for the ITK Python package. diff --git a/scripts/dockcross-manylinux-build-tarball.sh b/scripts/dockcross-manylinux-build-tarball.sh index 53a578b..ca29e75 100755 --- a/scripts/dockcross-manylinux-build-tarball.sh +++ b/scripts/dockcross-manylinux-build-tarball.sh @@ -4,16 +4,9 @@ # downloaded by the external module build scripts and used to build their # Python package on GitHub CI services. -if test -d /home/kitware/Packaging; then - cd /home/kitware/Packaging -fi - # ----------------------------------------------------------------------- zstd_exe=`(which zstd)` -if [[ -z ${zstd_exe} && -e /home/kitware/Support/zstd-build/programs/zstd ]]; then - zstd_exe=/home/kitware/Support/zstd-build/programs/zstd -fi # Find an appropriately versioned zstd. # @@ -38,11 +31,11 @@ fi # ----------------------------------------------------------------------- -tar -c --to-stdout \ +tar -cf ITKPythonBuilds-linux.tar \ ITKPythonPackage/ITK-* \ ITKPythonPackage/oneTBB* \ ITKPythonPackage/requirements-dev.txt \ - ITKPythonPackage/scripts > ITKPythonBuilds-linux.tar + ITKPythonPackage/scripts $zstd_exe -f \ -10 \ -T6 \ diff --git a/scripts/dockcross-manylinux-set-vars.sh b/scripts/dockcross-manylinux-set-vars.sh index 6ac55c8..ae0d279 100755 --- a/scripts/dockcross-manylinux-set-vars.sh +++ b/scripts/dockcross-manylinux-set-vars.sh @@ -19,13 +19,13 @@ # ITKPythonBuilds archive tag to use for ITK build artifacts. # See https://github.com/insightSoftwareConsortium/ITKpythonbuilds for available tags. -ITK_PACKAGE_VERSION=${ITK_PACKAGE_VERSION:=v5.4.0} +ITK_PACKAGE_VERSION=${ITK_PACKAGE_VERSION:=v6.0b01} # Github organization for fetching ITKPythonPackage build scripts ITKPYTHONPACKAGE_ORG=${ITKPYTHONPACKAGE_ORG:=InsightSoftwareConsortium} # ITKPythonPackage tag for fetching build scripts -ITKPYTHONPACKAGE_TAG=${ITKPYTHONPACKAGE_TAG:=master} +ITKPYTHONPACKAGE_TAG=${ITKPYTHONPACKAGE_TAG:=main} ######################################################################## # Docker image parameters @@ -41,7 +41,7 @@ TARGET_ARCH=${TARGET_ARCH:=x64} if [[ ${MANYLINUX_VERSION} == _2_28 && ${TARGET_ARCH} == x64 ]]; then IMAGE_TAG=${IMAGE_TAG:=20240304-9e57d2b} elif [[ ${MANYLINUX_VERSION} == _2_28 && ${TARGET_ARCH} == aarch64 ]]; then - IMAGE_TAG=${IMAGE_TAG:=2024-03-25-9206bd9} + IMAGE_TAG=${IMAGE_TAG:=2025.07.14-5} elif [[ ${MANYLINUX_VERSION} == 2014 ]]; then IMAGE_TAG=${IMAGE_TAG:=20240304-9e57d2b} else diff --git a/scripts/macpython-build-module-wheels.sh b/scripts/macpython-build-module-wheels.sh index 8ad1e8d..32c43bf 100755 --- a/scripts/macpython-build-module-wheels.sh +++ b/scripts/macpython-build-module-wheels.sh @@ -95,13 +95,13 @@ for VENV in "${VENVS[@]}"; do fi if [[ $(arch) == "arm64" ]]; then - plat_name="macosx-11.0-arm64" - osx_target="11.0" + plat_name="macosx-15.0-arm64" + osx_target="15.0" osx_arch="arm64" build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_arm64" else - plat_name="macosx-10.9-x86_64" - osx_target="10.9" + plat_name="macosx-15.0-x86_64" + osx_target="15.0" osx_arch="x86_64" build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64" fi diff --git a/scripts/macpython-build-wheels.sh b/scripts/macpython-build-wheels.sh index 2985aa8..fb04b3e 100755 --- a/scripts/macpython-build-wheels.sh +++ b/scripts/macpython-build-wheels.sh @@ -63,11 +63,11 @@ DELOCATE_PATCH=${VENV}/bin/delocate-patch build_type="Release" if [[ $(arch) == "arm64" ]]; then - osx_target="11.0" + osx_target="15.0" osx_arch="arm64" use_tbb="OFF" else - osx_target="10.9" + osx_target="15.0" osx_arch="x86_64" use_tbb="OFF" fi @@ -107,10 +107,10 @@ for VENV in "${VENVS[@]}"; do ${Python3_EXECUTABLE} -m pip install --upgrade -r ${SCRIPT_DIR}/../requirements-dev.txt if [[ $(arch) == "arm64" ]]; then - plat_name="macosx-11.0-arm64" + plat_name="macosx-15.0-arm64" build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_arm64" else - plat_name="macosx-10.9-x86_64" + plat_name="macosx-15.0-x86_64" build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64" fi if [[ ! -z "${MACOSX_DEPLOYMENT_TARGET}" ]]; then diff --git a/scripts/macpython-delocate-wheels.sh b/scripts/macpython-delocate-wheels.sh index 2f16cbe..60ac661 100755 --- a/scripts/macpython-delocate-wheels.sh +++ b/scripts/macpython-delocate-wheels.sh @@ -53,11 +53,11 @@ DELOCATE_PATCH=${VENV}/bin/delocate-patch build_type="Release" if [[ $(arch) == "arm64" ]]; then - osx_target="11.0" + osx_target="15.0" osx_arch="arm64" use_tbb="OFF" else - osx_target="10.9" + osx_target="15.0" osx_arch="x86_64" use_tbb="OFF" fi