Merge branch 'master' into release

thewtex · thewtex · commit efb8865f01f1 · 2022-11-11T09:06:08.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,8 +89,8 @@ if(ITKPythonPackage_SUPERBUILD)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
 
- # ITK master 2022-09-20
-  set(ITK_GIT_TAG "171fb2ba33a87041f99328a2f26612ff33aa9cc8")
+ # ITK master 2022-11-11
+  set(ITK_GIT_TAG "abf5fa10522a36bc51f42f20f426a622f42ed90d")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused
@@ -105,6 +105,15 @@ if(ITKPythonPackage_SUPERBUILD)
   endif()
 
   if(ITKPythonPackage_USE_TBB)
+
+    set(tbb_cmake_cache_args)
+    if(CMAKE_OSX_DEPLOYMENT_TARGET)
+      list(APPEND tbb_cmake_cache_args
+        -DCMAKE_CXX_OSX_DEPLOYMENT_TARGET_FLAG:STRING="-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}"
+        -DCMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG:STRING="-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}"
+        )
+    endif()
+
     ExternalProject_add(oneTBB
       URL https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.3.0.tar.gz
       URL_HASH SHA256=8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e
@@ -114,6 +123,7 @@ if(ITKPythonPackage_SUPERBUILD)
         -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/../oneTBB-prefix
         -DCMAKE_INSTALL_LIBDIR:STRING=lib # Skip default initialization by GNUInstallDirs CMake module
         ${ep_common_cmake_cache_args}
+        ${tbb_cmake_cache_args}
         -DCMAKE_BUILD_TYPE:STRING=Release
       BUILD_BYPRODUCTS "${TBB_DIR}/TBBConfig.cmake"
       USES_TERMINAL_DOWNLOAD 1
diff --git a/itkVersion.py b/itkVersion.py
@@ -1,4 +1,4 @@
-VERSION = '5.3rc04.post3'
+VERSION = '5.3rc04.post4'
 
 def get_versions():
     """Returns versions for the ITK Python package.
diff --git a/scripts/dockcross-manylinux-build-module-wheels.sh b/scripts/dockcross-manylinux-build-module-wheels.sh
@@ -18,7 +18,7 @@
 #
 
 MANYLINUX_VERSION=_2_28
-IMAGE_TAG=20220715-9ce3707
+IMAGE_TAG=20221108-102ebcc
 
 # Generate dockcross scripts
 docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
diff --git a/scripts/dockcross-manylinux-build-wheels.sh b/scripts/dockcross-manylinux-build-wheels.sh
@@ -8,7 +8,7 @@
 #   scripts/dockcross-manylinux-build-wheels.sh cp39
 
 MANYLINUX_VERSION=_2_28
-IMAGE_TAG=20220715-9ce3707
+IMAGE_TAG=20221108-102ebcc
 
 # Generate dockcross scripts
 docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
diff --git a/scripts/internal/manylinux-build-common.sh b/scripts/internal/manylinux-build-common.sh
@@ -12,7 +12,7 @@ if [[ $# -eq 0 ]]; then
   PYBIN=(/opt/python/*/bin)
   PYBINARIES=()
   for version in "${PYBIN[@]}"; do
-    if [[ ${version} == *"cp37"* || ${version} == *"cp38"* || ${version} == *"cp39"* || ${version} == *"cp310"* ]]; then
+    if [[ ${version} == *"cp37"* || ${version} == *"cp38"* || ${version} == *"cp39"* || ${version} == *"cp310"* || ${version} == *"cp311" ]]; then
       PYBINARIES+=(${version})
     fi
   done
@@ -70,7 +70,7 @@ case $(uname -m) in
 esac
 if ! type ninja > /dev/null 2>&1; then
   if test ! -d ninja; then
-    git clone git://github.com/ninja-build/ninja.git
+    git clone https://github.com/ninja-build/ninja.git
   fi
   pushd ninja
   git checkout release
diff --git a/scripts/internal/manylinux-build-module-wheels.sh b/scripts/internal/manylinux-build-module-wheels.sh
@@ -97,6 +97,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
       -DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
       -DSWIG_EXECUTABLE:FILEPATH=${itk_build_dir}/Wrapping/Generators/SwigInterface/swig/bin/swig \
       -DCMAKE_CXX_COMPILER_TARGET:STRING=$(uname -m)-linux-gnu \
+      -DCMAKE_INSTALL_LIBDIR:STRING=lib \
       -DBUILD_TESTING:BOOL=OFF \
       -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
       -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \
diff --git a/scripts/internal/windows_build_common.py b/scripts/internal/windows_build_common.py
@@ -4,7 +4,7 @@
 import os
 import shutil
 
-DEFAULT_PY_ENVS = ["37-x64", "38-x64", "39-x64", "310-x64"]
+DEFAULT_PY_ENVS = ["37-x64", "38-x64", "39-x64", "310-x64", "311-x64"]
 
 SCRIPT_DIR = os.path.dirname(__file__)
 ROOT_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, "..", ".."))
diff --git a/scripts/macpython-build-common.sh b/scripts/macpython-build-common.sh
@@ -16,7 +16,7 @@ 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)"
+    [ -- python_versions ]        build wheel for a specific python version(s). (e.g. -- 3.9 3.10)"
   exit 2
 }
 
@@ -49,7 +49,7 @@ 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 [[ -n "${PYTHON_VERSIONS}" ]]; then
+if [[ -z "${PYTHON_VERSIONS}" ]]; then
   PYBINARIES=(${MACPYTHON_PY_PREFIX}/*)
 else
   PYBINARIES=()
diff --git a/scripts/macpython-build-module-wheels.sh b/scripts/macpython-build-module-wheels.sh
@@ -56,6 +56,9 @@ for VENV in "${VENVS[@]}"; do
       osx_arch="x86_64"
       build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64"
     fi
+    if [[ ! -z "${MACOSX_DEPLOYMENT_TARGET}" ]]; then
+      osx_target="${MACOSX_DEPLOYMENT_TARGET}"
+    fi
 
     if [[ -e $PWD/requirements-dev.txt ]]; then
       ${Python3_EXECUTABLE} -m pip install --upgrade -r $PWD/requirements-dev.txt
@@ -64,6 +67,7 @@ for VENV in "${VENVS[@]}"; do
     ${Python3_EXECUTABLE} setup.py bdist_wheel --build-type Release --plat-name ${plat_name} -G Ninja -- \
       -DCMAKE_MAKE_PROGRAM:FILEPATH=${NINJA_EXECUTABLE} \
       -DITK_DIR:PATH=${itk_build_path} \
+      -DCMAKE_INSTALL_LIBDIR:STRING=lib \
       -DITK_USE_SYSTEM_SWIG:BOOL=ON \
       -DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
       -DSWIG_EXECUTABLE:FILEPATH=${itk_build_path}/Wrapping/Generators/SwigInterface/swig/bin/swig \
diff --git a/scripts/macpython-build-wheels.sh b/scripts/macpython-build-wheels.sh
@@ -13,7 +13,7 @@
 # For example,
 #
 #   export DYLD_LIBRARY_PATH="/path/to/libs"
-#   scripts/macpython-build-module-wheels.sh cp39
+#   scripts/macpython-build-module-wheels.sh 3.9
 #
 
 # -----------------------------------------------------------------------
@@ -50,11 +50,18 @@ DELOCATE_LISTDEPS=${VENV}/bin/delocate-listdeps
 DELOCATE_WHEEL=${VENV}/bin/delocate-wheel
 DELOCATE_PATCH=${VENV}/bin/delocate-patch
 
+build_type="Release"
+
 if [[ $(arch) == "arm64" ]]; then
+  osx_target="11.0"
+  osx_arch="arm64"
   use_tbb="OFF"
 else
+  osx_target="10.9"
+  osx_arch="x86_64"
   use_tbb="ON"
 fi
+
 # Build standalone project and populate archive cache
 tbb_dir=$PWD/oneTBB-prefix/lib/cmake/TBB
 # So delocate can find the libs
@@ -64,7 +71,10 @@ pushd ITK-source > /dev/null 2>&1
   ${CMAKE_EXECUTABLE} -DITKPythonPackage_BUILD_PYTHON:PATH=0 \
     -DITKPythonPackage_USE_TBB:BOOL=${use_tbb} \
     -G Ninja \
+    -DCMAKE_BUILD_TYPE:STRING=${build_type} \
     -DCMAKE_MAKE_PROGRAM:FILEPATH=${NINJA_EXECUTABLE} \
+    -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${osx_target} \
+    -DCMAKE_OSX_ARCHITECTURES:STRING=${osx_arch} \
       ${SCRIPT_DIR}/../
   ${NINJA_EXECUTABLE}
 popd > /dev/null 2>&1
@@ -83,18 +93,16 @@ for VENV in "${VENVS[@]}"; do
 
     ${Python3_EXECUTABLE} -m pip install --upgrade -r ${SCRIPT_DIR}/../requirements-dev.txt
 
-    build_type="Release"
     if [[ $(arch) == "arm64" ]]; then
       plat_name="macosx-11.0-arm64"
-      osx_target="11.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"
-      osx_arch="x86_64"
       build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64"
     fi
+    if [[ ! -z "${MACOSX_DEPLOYMENT_TARGET}" ]]; then
+      osx_target="${MACOSX_DEPLOYMENT_TARGET}"
+    fi
     source_path=${SCRIPT_DIR}/../ITK-source/ITK
     SETUP_PY_CONFIGURE="${script_dir}/setup_py_configure.py"
 
diff --git a/scripts/macpython-install-python.sh b/scripts/macpython-install-python.sh
@@ -43,16 +43,17 @@ GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py
 DOWNLOADS_SDIR=downloads
 WORKING_SDIR=working
 
-# As of 5 April 2021 - latest Python of each version with binary download
+# As of 2 November 2022 - latest Python of each version with binary download
 # available.
 # See: https://www.python.org/downloads/mac-osx/
 LATEST_2p7=2.7.18
 LATEST_3p5=3.5.4
 LATEST_3p6=3.6.8
 LATEST_3p7=3.7.9
 LATEST_3p8=3.8.10
-LATEST_3p9=3.9.5
-LATEST_3p10=3.10.0
+LATEST_3p9=3.9.13
+LATEST_3p10=3.10.8
+LATEST_3p11=3.11.0
 
 
 function check_python {
@@ -109,7 +110,9 @@ function fill_pyver {
         echo $ver
     elif [ $ver == 2 ] || [ $ver == "2.7" ]; then
         echo $LATEST_2p7
-    elif [ $ver == 3 ] || [ $ver == "3.10" ]; then
+    elif [ $ver == 3 ] || [ $ver == "3.11" ]; then
+        echo $LATEST_3p11
+    elif [ $ver == "3.10" ]; then
         echo $LATEST_3p10
     elif [ $ver == "3.9" ]; then
         echo $LATEST_3p9
@@ -199,10 +202,10 @@ function pyinst_fname_for_version {
         echo "python-${py_version}-macos11.${inst_ext}"
       fi
     else
-      if [ "$py_version" == "3.10.0" ]; then
-        echo "python-${py_version}-macos${py_osx_ver}.${inst_ext}"
-      else
+      if [ "$py_version" == "3.7.9" ]; then
         echo "python-${py_version}-macosx${py_osx_ver}.${inst_ext}"
+      else
+        echo "python-${py_version}-macos${py_osx_ver}.${inst_ext}"
       fi
     fi
 }
@@ -396,21 +399,22 @@ function make_workon_venv {
 }
 
 # Remove previous versions
-sudo rm -rf ${MACPYTHON_FRAMEWORK}
+#echo "Remove and update Python files at ${MACPYTHON_FRAMEWORK}"
+#sudo rm -rf ${MACPYTHON_FRAMEWORK}
 
 if test "$(arch)" == "arm64"; then
   echo "we are arm"
   PLAT=arm64
-  for pyversion in $LATEST_3p9 $LATEST_3p10; do
+  for pyversion in $LATEST_3p9 $LATEST_3p10 $LATEST_3p11; do
     install_macpython $pyversion 11
     install_virtualenv
   done
 else
-  for pyversion in $LATEST_3p7 $LATEST_3p8 $LATEST_3p9; do
+  for pyversion in $LATEST_3p7; do
     install_macpython $pyversion 10.9
     install_virtualenv
   done
-  for pyversion in $LATEST_3p10; do
+  for pyversion in $LATEST_3p8 $LATEST_3p9 $LATEST_3p10 $LATEST_3p11; do
     install_macpython $pyversion 11
     install_virtualenv
   done
diff --git a/scripts/windows_build_module_wheels.py b/scripts/windows_build_module_wheels.py
@@ -69,6 +69,7 @@ def build_wheels(py_envs=DEFAULT_PY_ENVS, cleanup=True, cmake_options=[]):
                 "-DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel",
                 "-DSWIG_EXECUTABLE:FILEPATH=%s/Wrapping/Generators/SwigInterface/swig/bin/swig.exe" % itk_build_path,
                 "-DBUILD_TESTING:BOOL=OFF",
+                "-DCMAKE_INSTALL_LIBDIR:STRING=lib",
                 "-DPython3_EXECUTABLE:FILEPATH=%s" % python_executable,
                 "-DPython3_INCLUDE_DIR:PATH=%s" % python_include_dir,
                 "-DPython3_INCLUDE_DIRS:PATH=%s" % python_include_dir,
@@ -95,7 +96,7 @@ def rename_wheel_init(py_env, filepath):
     module_version = w.version
 
     dist_dir = os.path.dirname(filepath)
-    wheel_dir = os.path.join(dist_dir, "itk_" + module_name + "-" + module_version)
+    wheel_dir = os.path.join(dist_dir, "itk_" + module_name.replace('-','_') + "-" + module_version)
     init_dir = os.path.join(wheel_dir, "itk")
     init_file = os.path.join(init_dir, "__init__.py")
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION = '5.3rc04.post3'`
	`1`	`+VERSION = '5.3rc04.post4'`
`2`	`2`
`3`	`3`	`def get_versions():`
`4`	`4`	`"""Returns versions for the ITK Python package.`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`#`
`19`	`19`
`20`	`20`	`MANYLINUX_VERSION=_2_28`
`21`		`-IMAGE_TAG=20220715-9ce3707`
	`21`	`+IMAGE_TAG=20221108-102ebcc`
`22`	`22`
`23`	`23`	`# Generate dockcross scripts`
`24`	`24`	`docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64`