Merge branch 'release'

Author: thewtex

scripts/macpython-build-module-wheels.sh

@@ -71,6 +71,7 @@ fi
 
 VENV="${VENVS[0]}"
 Python3_EXECUTABLE=${VENV}/bin/python3
+dot_clean ${VENV}
 ${Python3_EXECUTABLE} -m pip install --no-cache delocate
 DELOCATE_LISTDEPS=${VENV}/bin/delocate-listdeps
 DELOCATE_WHEEL=${VENV}/bin/delocate-wheel

scripts/macpython-build-tarball.sh

@@ -13,6 +13,7 @@ if test $(arch) == "arm64"; then
 fi
 
 pushd /Users/svc-dashboard/D/P > /dev/null
+dot_clean ITKPythonPackage
 tar -cf ITKPythonBuilds-macosx${arch_postfix}.tar \
   ITKPythonPackage/ITK-* \
   ${tbb_contents} \

scripts/macpython-download-cache-and-build-module-wheels.sh

@@ -55,7 +55,7 @@ if [[ ! -f ITKPythonBuilds-macosx${tarball_arch}.tar.zst ]]; then
 fi
 unzstd --long=31 ITKPythonBuilds-macosx${tarball_arch}.tar.zst -o ITKPythonBuilds-macosx${tarball_arch}.tar
 PATH="$(dirname $(brew list gnu-tar | grep gnubin)):$PATH"
-gtar xf ITKPythonBuilds-macosx${tarball_arch}.tar --checkpoint=10000 --checkpoint-action=dot \
+gtar xf ITKPythonBuilds-macosx${tarball_arch}.tar --warning=no-unknown-keyword --checkpoint=10000 --checkpoint-action=dot \
   ITKPythonPackage/ITK-source \
   ITKPythonPackageRequiredExtractionDir.txt \
   ITKPythonPackage/scripts
@@ -64,7 +64,7 @@ gtar xf ITKPythonBuilds-macosx${tarball_arch}.tar --checkpoint=10000 --checkpoin
 args=( "$@"  )
 source ITKPythonPackage/scripts/macpython-build-common.sh
 for version in "$PYTHON_VERSIONS"; do
-  gtar xf ITKPythonBuilds-macosx${tarball_arch}.tar --checkpoint=10000 --checkpoint-action=dot \
+  gtar xf ITKPythonBuilds-macosx${tarball_arch}.tar --warning=no-unknown-keyword --checkpoint=10000 --checkpoint-action=dot \
     --wildcards "ITKPythonPackage/ITK-${version}-macosx*" \
     "ITKPythonPackage/venvs/${version}"
 done

scripts/windows_build_module_wheels.py

@@ -125,13 +125,15 @@ def build_wheels(py_envs=DEFAULT_PY_ENVS, cleanup=True, cmake_options=[]):
                 if cleanup:
                     check_call([python_executable, "setup.py", "clean"])
 
-def rename_wheel_init(py_env, filepath):
+def rename_wheel_init(py_env, filepath, add_module_name=True):
     """
-    Rename module __init__ file in wheel.
-    This is required to prevent modules to override ITK's __init__ file on install.
-    If the module ships its own __init__ file, it is automatically renamed to
-    __init_{module_name}__ by this function. The renamed __init__ file will be executed
-    by ITK's __init__ file when loading ITK.
+    Rename module __init__ (if add_module_name is True) or __init_module__ (if
+    add_module_name is False) file in wheel.  This is required to prevent
+    modules to override ITK's __init__ file on install or to prevent delvewheel
+    to override __init_module__ file.  If the module ships its own __init__
+    file, it is automatically renamed to __init_{module_name}__ by this
+    function. The renamed __init__ file will be executed by ITK's __init__ file
+    when loading ITK.
     """
     python_executable, python_include_dir, python_library, pip, ninja_executable, path = venv_paths(py_env)
 
@@ -145,11 +147,15 @@ def rename_wheel_init(py_env, filepath):
     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")
+    init_file_module = os.path.join(init_dir, "__init_" + module_name.split("-")[0] + "__.py")
 
     # Unpack wheel and rename __init__ file if it exists.
     check_call([python_executable, "-m", "wheel", "unpack", filepath, "-d", dist_dir])
-    if os.path.isfile(init_file):
-        shutil.move(init_file, os.path.join(init_dir, "__init_" + module_name + "__.py"))
+    if add_module_name and os.path.isfile(init_file):
+        shutil.move(init_file, init_file_module)
+    if not add_module_name and os.path.isfile(init_file_module):
+        shutil.move(init_file_module, init_file)
+
     # Pack wheel and clean wheel folder
     check_call([python_executable, "-m", "wheel", "pack", wheel_dir, "-d", dist_dir])
     shutil.rmtree(wheel_dir)
@@ -160,6 +166,10 @@ def fixup_wheel(py_envs, filepath, lib_paths:str='', exclude_libs:str=''):
 
     py_env = py_envs[0]
 
+    # Make sure the module __init_module__.py file has the expected name for
+    # delvewheel, i.e., __init__.py.
+    rename_wheel_init(py_env, filepath, False)
+
     delve_wheel = os.path.join("C:/P/IPP", "venv-" + py_env, "Scripts", "delvewheel.exe")
     check_call([delve_wheel, "repair", "--no-mangle-all", "--add-path",
         lib_paths, "--no-dll", exclude_libs, "--ignore-in-wheel", "-w",