Merge branch 'master' into module-cleanup

Author: thewtex

CMakeLists.txt

@@ -89,8 +89,8 @@ if(ITKPythonPackage_SUPERBUILD)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
 
- # ITK nightly-master 2022-07-27
-  set(ITK_GIT_TAG "fb3bc5d9799b3e0ff86505413c2d58c56fd97aac")
+ # ITK master 2022-09-20
+  set(ITK_GIT_TAG "171fb2ba33a87041f99328a2f26612ff33aa9cc8")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused

itkVersion.py

@@ -1,4 +1,4 @@
-VERSION = '5.3rc04.dev20220728+19.g8f5c337311'
+VERSION = '5.3rc04.post3'
 
 def get_versions():
     """Returns versions for the ITK Python package.

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

@@ -46,25 +46,27 @@ if [[ ! -f ./zstd-1.2.0-linux/bin/unzstd ]]; then
   exit 255
 fi
 
-if [[ ! -f ITKPythonBuilds-linux.tar.zst ]]; then
-  curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.2.0.post1}/ITKPythonBuilds-linux.tar.zst -O
+TARBALL_NAME="ITKPythonBuilds-linux${TARBALL_SPECIALIZATION}.tar"
+
+if [[ ! -f ${TARBALL_NAME}.zst ]]; then
+  curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.2.0.post1}/${TARBALL_NAME}.zst -O
 fi
-if [[ ! -f ./ITKPythonBuilds-linux.tar.zst ]]; then
-  echo "ERROR: can not find required binary './ITKPythonBuilds-linux.tar.zst'"
+if [[ ! -f ./${TARBALL_NAME}.zst ]]; then
+  echo "ERROR: can not find required binary './${TARBALL_NAME}.zst'"
   exit 255
 fi
-./zstd-1.2.0-linux/bin/unzstd ./ITKPythonBuilds-linux.tar.zst -o ITKPythonBuilds-linux.tar
+./zstd-1.2.0-linux/bin/unzstd ./${TARBALL_NAME}.zst -o ${TARBALL_NAME}
 if [ "$#" -lt 1 ]; then
   echo "Extracting all files";
-  tar xf ITKPythonBuilds-linux.tar
+  tar xf ${TARBALL_NAME}
 else
   echo "Extracting files relevant for: $1";
-  tar xf ITKPythonBuilds-linux.tar ITKPythonPackage/scripts/
-  tar xf ITKPythonBuilds-linux.tar ITKPythonPackage/ITK-source/
-  tar xf ITKPythonBuilds-linux.tar ITKPythonPackage/oneTBB-prefix/
-  tar xf ITKPythonBuilds-linux.tar --wildcards ITKPythonPackage/ITK-$1*
+  tar xf ${TARBALL_NAME} ITKPythonPackage/scripts/
+  tar xf ${TARBALL_NAME} ITKPythonPackage/ITK-source/
+  tar xf ${TARBALL_NAME} ITKPythonPackage/oneTBB-prefix/
+  tar xf ${TARBALL_NAME} --wildcards ITKPythonPackage/ITK-$1*
 fi
-rm ITKPythonBuilds-linux.tar
+rm ${TARBALL_NAME}
 if [[ ! -f ./ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh ]]; then
   echo "ERROR: can not find required binary './ITKPythonPackage/scripts/dockcross-manylinux-build-module-wheels.sh'"
   exit 255

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

@@ -90,6 +90,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
       echo 'ITK source tree not available!' 1>&2
       exit 1
     fi
+    ${PYBIN}/python setup.py clean
     ${PYBIN}/python setup.py bdist_wheel --build-type Release -G Ninja -- \
       -DITK_DIR:PATH=${itk_build_dir} \
       -DITK_USE_SYSTEM_SWIG:BOOL=ON \

scripts/macpython-build-common.sh

@@ -7,14 +7,53 @@ SCRIPT_DIR=$(cd $(dirname $0) || exit 1; pwd)
 
 MACPYTHON_PY_PREFIX=/Library/Frameworks/Python.framework/Versions
 
+# -----------------------------------------------------------------------
+# Script argument parsing
+#
+usage()
+{
+  echo "Usage:
+  macpython-build-common
+    [ -h | --help ]           show usage
+    [ -c | --cmake_options ]  space-separated string of CMake options to forward to the module (e.g. \"-DBUILD_TESTING=OFF\")
+    [ -- python_versions ]        build wheel for a specific python version(s). (e.g. -- cp39 cp310)"
+  exit 2
+}
+
+PYTHON_VERSIONS=""
+CMAKE_OPTIONS=""
+
+while (( "$#" )); do
+  case "$1" in
+    -c|--cmake_options)
+      CMAKE_OPTIONS="$2";
+      shift 2;;
+    -h|--help)
+      usage;
+      break;;
+    --)
+      shift;
+      break;;
+    *)
+      # Parse any unrecognized arguments as python versions
+      PYTHON_VERSIONS="${PYTHON_VERSIONS} $1";
+      shift;;
+  esac
+done
+
+# Parse all arguments after "--" as python versions
+PYTHON_VERSIONS="${PYTHON_VERSIONS} $@"
+# Trim whitespace
+PYTHON_VERSIONS=$(xargs <<< "${PYTHON_VERSIONS}")
+
 # Versions can be restricted by passing them in as arguments to the script
 # For example,
 # macpython-build-wheels.sh 3.9
-if [[ $# -eq 0 ]]; then
+if [[ -n "${PYTHON_VERSIONS}" ]]; then
   PYBINARIES=(${MACPYTHON_PY_PREFIX}/*)
 else
   PYBINARIES=()
-  for version in "$@"; do
+  for version in "$PYTHON_VERSIONS"; do
     PYBINARIES+=(${MACPYTHON_PY_PREFIX}/*${version}*)
   done
 fi

scripts/macpython-build-module-wheels.sh

@@ -72,6 +72,7 @@ for VENV in "${VENVS[@]}"; do
       -DBUILD_TESTING:BOOL=OFF \
       -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
       -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
+      ${CMAKE_OPTIONS} \
     || exit 1
     # ${Python3_EXECUTABLE} setup.py clean    # Permission denied
 done

scripts/macpython-build-wheels.sh

@@ -124,7 +124,8 @@ for VENV in "${VENVS[@]}"; do
         -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
         -DModule_ITKTBB:BOOL=${use_tbb} \
         -DTBB_DIR:PATH=${tbb_dir} \
-        -DITK_WRAP_DOC:BOOL=ON
+        -DITK_WRAP_DOC:BOOL=ON \
+        ${CMAKE_OPTIONS}
       # Cleanup
       ${Python3_EXECUTABLE} setup.py clean
 
@@ -159,6 +160,7 @@ for VENV in "${VENVS[@]}"; do
           -DITK_WRAP_DOC:BOOL=ON \
           -DModule_ITKTBB:BOOL=${use_tbb} \
           -DTBB_DIR:PATH=${tbb_dir} \
+          ${CMAKE_OPTIONS} \
           -G Ninja \
           ${source_path} \
         && ninja\
@@ -185,6 +187,7 @@ for VENV in "${VENVS[@]}"; do
           -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
           -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
           -DITK_WRAP_DOC:BOOL=ON \
+          ${CMAKE_OPTIONS} \
         || exit 1
         # Cleanup
         ${Python3_EXECUTABLE} setup.py clean