Skip to content

Commit b15a64e

Browse files
thewtexthewtex
committed
Merge branch 'release'
2 parents ab4b64f + 04d0446 commit b15a64e

20 files changed

+73
-67
lines changed

‎CMakeLists.txt‎

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

8383
set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
8484

85-
# main branch, 2025-09-22
86-
set(ITK_GIT_TAG "0f93d6c875ab1a053ccb1a27f9f55b8aa2c4c20b")
85+
# release branch, 2026-03-10
86+
set(ITK_GIT_TAG "c6e1c1be6a86236cbb812bd71eec5a4df9b1353c")
8787

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

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,13 @@ documentation for more information on building wheels by hand.
8484
### What target platforms and architectures are supported?
8585

8686
ITKPythonPackage currently supports building wheels for the following platforms and architectures:
87-
- Windows 10 x86_64 platforms
88-
- Windows 11 x86_64 platforms
89-
- MacOS 15.0+ arm64 platforms
90-
- Linux glibc 2.17+ (E.g. Ubuntu 18.04+) x86_64 platforms
91-
- Linux glibc 2.28+ (E.g. Ubuntu 20.04+) aarch64 (ARMv8) platforms
87+
- Windows 10 x86_64 platforms
88+
- Windows 11 x86_64 platforms
89+
- MacOS 15.0+ arm64 platforms
90+
- Linux glibc 2.17+ (E.g. Ubuntu 18.04+) x86_64 platforms
91+
- Linux glibc 2.28+ (E.g. Ubuntu 20.04+) aarch64 (ARMv8) platforms
92+
93+
Python 3.10+ is required.
9294

9395
### What should I do if my target platform/architecture does not appear on the list above?
9496

‎itkVersion.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from packaging.version import Version
22

33
# Version needs to be python PEP 440 compliant (no leading v)
4-
VERSION = '6.0b1'.removeprefix("v")
4+
VERSION = '6.0b2'.removeprefix("v")
55

66
def get_versions():
77
"""Returns versions for the ITK Python package.

‎scripts/dockcross-manylinux-build-module-wheels.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Versions can be restricted by passing them in as arguments to the script
1111
# For example,
1212
#
13-
# scripts/dockcross-manylinux-build-module-wheels.sh cp39
13+
# scripts/dockcross-manylinux-build-module-wheels.sh cp310
1414
#
1515
# ===========================================
1616
# ENVIRONMENT VARIABLES
@@ -19,7 +19,7 @@
1919
# For example,
2020
#
2121
# export MANYLINUX_VERSION="_2_28"
22-
# scripts/dockcross-manylinux-build-module-wheels.sh cp39
22+
# scripts/dockcross-manylinux-build-module-wheels.sh cp310
2323
#
2424
# `LD_LIBRARY_PATH`: Shared libraries to be included in the resulting wheel.
2525
# For instance, `export LD_LIBRARY_PATH="/path/to/OpenCL.so:/path/to/OpenCL.so.1.2"`

‎scripts/dockcross-manylinux-build-wheels.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Versions can be restricted by passing them in as arguments to the script
66
# For example,
77
#
8-
# scripts/dockcross-manylinux-build-wheels.sh cp39
8+
# scripts/dockcross-manylinux-build-wheels.sh cp310
99
#
1010
# A specialized manylinux image and tag can be used by exporting to
1111
# MANYLINUX_VERSION and IMAGE_TAG before running this script.
@@ -15,7 +15,7 @@
1515
#
1616
# export MANYLINUX_VERSION=2014
1717
# export IMAGE_TAG=20221205-459c9f0
18-
# scripts/dockcross-manylinux-build-module-wheels.sh cp39
18+
# scripts/dockcross-manylinux-build-module-wheels.sh cp310
1919
#
2020
script_dir=$(cd $(dirname $0) || exit 1; pwd)
2121
source "${script_dir}/oci_exe.sh"
@@ -25,7 +25,7 @@ oci_exe=$(ociExe)
2525
MANYLINUX_VERSION=${MANYLINUX_VERSION:=_2_28}
2626

2727
if [[ ${MANYLINUX_VERSION} == _2_28 ]]; then
28-
IMAGE_TAG=${IMAGE_TAG:=20250913-6ea98ba}
28+
IMAGE_TAG=${IMAGE_TAG:=20260203-3dfb3ff}
2929
elif [[ ${MANYLINUX_VERSION} == 2014 ]]; then
3030
IMAGE_TAG=${IMAGE_TAG:=20240304-9e57d2b}
3131
else

‎scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@
1010
# Versions can be restricted by passing them in as arguments to the script
1111
# For example,
1212
#
13-
# scripts/dockcross-manylinux-build-module-wheels.sh cp39
13+
# scripts/dockcross-manylinux-build-module-wheels.sh cp310
1414
#
1515
# ===========================================
1616
# ENVIRONMENT VARIABLES
1717
#
1818
# These variables are set with the `export` bash command before calling the script.
1919
# For example,
2020
#
21-
# export ITK_PACKAGE_VERSION="v5.4.0"
22-
# export ITKPYTHONPACKAGE_ORG="InsightSoftwareConsortium"
23-
# scripts/dockcross-manylinux-download-cache-and-build-module-wheels cp39
21+
# scripts/dockcross-manylinux-build-module-wheels.sh cp310
2422
#
2523
# `ITKPYTHONPACKAGE_ORG`: Github organization for fetching ITKPythonPackage build scripts.
2624
#
@@ -40,7 +38,7 @@ usage()
4038
[ -h | --help ] show usage
4139
[ -c | --cmake_options ] space-delimited string containing CMake options to forward to the module (e.g. \"-DBUILD_TESTING=OFF\")
4240
[ -x | --exclude_libs ] semicolon-delimited library names to exclude when repairing wheel (e.g. \"libcuda.so\")
43-
[ python_version ] build wheel for a specific python version. (e.g. cp39)"
41+
[ python_version ] build wheel for a specific python version. (e.g. cp310)"
4442
exit 2
4543
}
4644

‎scripts/dockcross-manylinux-download-cache.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ usage()
3939
echo "Usage:
4040
dockcross-manylinux-download-cache.sh
4141
[ -h | --help ] show usage
42-
[ python_version ] build wheel for a specific python version. (e.g. cp39)"
42+
[ python_version ] build wheel for a specific python version. (e.g. cp310)"
4343
exit 2
4444
}
4545

‎scripts/dockcross-manylinux-set-vars.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# For example,
1111
#
1212
# export ITK_PACKAGE_VERSION=v5.4.0
13-
# scripts/dockcross-manylinux-set-vars.sh cp39
13+
# scripts/dockcross-manylinux-set-vars.sh cp310
1414
#
1515
########################################################################
1616

@@ -39,7 +39,7 @@ TARGET_ARCH=${TARGET_ARCH:=x64}
3939

4040
# Specialized manylinux image tag to use for building.
4141
if [[ ${MANYLINUX_VERSION} == _2_28 && ${TARGET_ARCH} == x64 ]]; then
42-
IMAGE_TAG=${IMAGE_TAG:=20250913-6ea98ba}
42+
IMAGE_TAG=${IMAGE_TAG:=20260203-3dfb3ff}
4343
elif [[ ${MANYLINUX_VERSION} == _2_28 && ${TARGET_ARCH} == aarch64 ]]; then
4444
IMAGE_TAG=${IMAGE_TAG:=2025.08.12-1}
4545
elif [[ ${MANYLINUX_VERSION} == 2014 ]]; then

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dnf upgrade -y almalinux-release
77
# Newer Python.cmake module required for SABI
88
pipx upgrade cmake
99
yum -y install sudo ninja-build
10-
/opt/python/cp39-cp39/bin/python -m pip install -r /ITKPythonPackage/requirements-dev.txt
10+
/opt/python/cp310-cp310/bin/python -m pip install -r /ITKPythonPackage/requirements-dev.txt
1111
for PYBIN in "${PYBINARIES[@]}"; do
1212
${PYBIN}/pip install -r /ITKPythonPackage/requirements-dev.txt
1313
done

‎scripts/internal/manylinux-build-common.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ script_dir=$(cd $(dirname $0) || exit 1; pwd)
77

88
# Versions can be restricted by passing them in as arguments to the script
99
# For example,
10-
# manylinux-build-wheels.sh cp39
10+
# manylinux-build-wheels.sh cp310
1111
if [[ $# -eq 0 ]]; then
1212
PYBIN=(/opt/python/*/bin)
1313
PYBINARIES=()
1414
for version in "${PYBIN[@]}"; do
15-
if [[ ${version} == *"cp39"* || ${version} == *"cp310"* || ${version} == *"cp311"* ]]; then
15+
if [[ ${version} == *"cp310"* || ${version} == *"cp311"* ]]; then
1616
PYBINARIES+=(${version})
1717
fi
1818
done

0 commit comments

Comments
 (0)