Merge remote-tracking branch 'upstream/release' into release

Author: thewtex

CMakeLists.txt

@@ -72,10 +72,10 @@ if(ITKPythonPackage_SUPERBUILD)
   #-----------------------------------------------------------------------------
   include(ExternalProject)
 
-  set(ITK_REPOSITORY "https://github.com/thewtex/ITK.git")
+  set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
 
-  # ITK release 2021-04-24
-  set(ITK_GIT_TAG "a9b3dbf3e4d632c217c632c81ada39b4dfb2d2ee")
+  # ITK release 2021-04-28
+  set(ITK_GIT_TAG "fa36932038fc81d57ea161600ba4fa605d252487")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused

scripts/macpython-build-module-wheels.sh

@@ -38,12 +38,14 @@ for VENV in "${VENVS[@]}"; do
 
     if [[ $(arch) == "arm64" ]]; then
       plat_name="macosx-11.0-arm64"
-      osx_target="10.9"
-      build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64"
-    else
-      plat_name="macosx-10.9-x86_64"
       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 [[ -e $PWD/requirements-dev.txt ]]; then
@@ -57,7 +59,7 @@ for VENV in "${VENVS[@]}"; do
       -DWRAP_ITK_INSTALL_COMPONENT_IDENTIFIER:STRING=PythonWheel \
       -DSWIG_EXECUTABLE:FILEPATH=${itk_build_path}/Wrapping/Generators/SwigInterface/swig/bin/swig \
       -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${osx_target} \
-      -DCMAKE_OSX_ARCHITECTURES:STRING=$(arch) \
+      -DCMAKE_OSX_ARCHITECTURES:STRING=${osx_arch} \
       -DBUILD_TESTING:BOOL=OFF \
       -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE} \
       -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR} \

scripts/macpython-build-tarball.sh

@@ -4,14 +4,19 @@
 # downloaded by the external module build scripts and used to build their
 # Python package on GitHub CI services.
 
+arch_postfix=""
+if test $(arch) == "arm64"; then
+  arch_postfix="-arm64"
+fi
+
 pushd /Users/svc-dashboard/D/P > /dev/null
-tar -cf ITKPythonBuilds-macosx.tar \
+tar -cf ITKPythonBuilds-macosx${arch_postfix}.tar \
   ITKPythonPackage/ITK-* \
   ITKPythonPackage/venvs \
   ITKPythonPackageRequiredExtractionDir.txt \
   ITKPythonPackage/scripts
-/usr/local/bin/zstd -f \
+zstd -f \
   -15 \
-  ./ITKPythonBuilds-macosx.tar \
-  -o ./ITKPythonBuilds-macosx.tar.zst
+  ./ITKPythonBuilds-macosx${arch_postfix}.tar \
+  -o ./ITKPythonBuilds-macosx${arch_postfix}.tar.zst
 popd > /dev/null

scripts/macpython-build-wheels.sh

@@ -67,11 +67,13 @@ for VENV in "${VENVS[@]}"; do
     build_type="Release"
     if [[ $(arch) == "arm64" ]]; then
       plat_name="macosx-11.0-arm64"
-      osx_target="10.9"
+      osx_target="11.0"
+      osx_arch="arm64"
       build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_x86_64"
     else
       plat_name="macosx-10.9-x86_64"
-      osx_target="11.0"
+      osx_target="10.9"
+      osx_arch="x86_64"
       build_path="${SCRIPT_DIR}/../ITK-${py_mm}-macosx_arm64"
     fi
     source_path=${SCRIPT_DIR}/../ITK-source/ITK
@@ -94,7 +96,7 @@ for VENV in "${VENVS[@]}"; do
         -DITK_SOURCE_DIR:PATH= ${source_path} \
         -DITK_BINARY_DIR:PATH=${build_path} \
         -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${osx_target} \
-        -DCMAKE_OSX_ARCHITECTURES:STRING=$(arch) \
+        -DCMAKE_OSX_ARCHITECTURES:STRING=${osx_arch} \
         -DITK_WRAP_unsigned_short:BOOL=ON \
         -DITK_WRAP_double:BOOL=ON \
         -DITK_WRAP_complex_double:BOOL=ON \
@@ -121,7 +123,7 @@ for VENV in "${VENVS[@]}"; do
           -DITK_BINARY_DIR:PATH=${build_path} \
           -DBUILD_TESTING:BOOL=OFF \
           -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${osx_target} \
-          -DCMAKE_OSX_ARCHITECTURES:STRING=$(arch) \
+          -DCMAKE_OSX_ARCHITECTURES:STRING=${osx_arch} \
           -DITK_WRAP_unsigned_short:BOOL=ON \
           -DITK_WRAP_double:BOOL=ON \
           -DITK_WRAP_complex_double:BOOL=ON \
@@ -149,7 +151,7 @@ for VENV in "${VENVS[@]}"; do
           -DITK_SOURCE_DIR:PATH=${source_path} \
           -DITK_BINARY_DIR:PATH=${build_path} \
           -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${osx_target} \
-          -DCMAKE_OSX_ARCHITECTURES:STRING=$(arch) \
+          -DCMAKE_OSX_ARCHITECTURES:STRING=${osx_arch} \
           -DITKPythonPackage_ITK_BINARY_REUSE:BOOL=ON \
           -DITKPythonPackage_WHEEL_NAME:STRING=${wheel_name} \
           -DITK_WRAP_unsigned_short:BOOL=ON \