Merge pull request #267 from thewtex/scikit-build-core

Scikit build core

Author: thewtex

.gitignore

@@ -43,6 +43,7 @@ lib
 lib64
 MANIFEST
 oneTBB-prefix/
+pyproject.toml
 
 # Installer logs
 pip-log.txt

CMakeLists.txt

@@ -48,6 +48,11 @@ if(ITKPythonPackage_SUPERBUILD)
       -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
       )
   endif()
+  set(ep_download_extract_timestamp_arg )
+  if(CMAKE_VERSION VERSION_EQUAL "3.24" OR CMAKE_VERSION VERSION_GREATER "3.24")
+    # See https://cmake.org/cmake/help/latest/policy/CMP0135.html
+    set(ep_download_extract_timestamp_arg DOWNLOAD_EXTRACT_TIMESTAMP 1)
+  endif()
 
   #-----------------------------------------------------------------------------
   # Options
@@ -89,8 +94,8 @@ if(ITKPythonPackage_SUPERBUILD)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
 
- # ITK release 2023-10-11
-  set(ITK_GIT_TAG "v5.4rc02")
+  # master branch, 2024-04-04
+  set(ITK_GIT_TAG "4449a99921a72ac6ceb4f8fa4521c6b6db6cbfe1")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused
@@ -124,6 +129,7 @@ if(ITKPythonPackage_SUPERBUILD)
         -DCMAKE_INSTALL_LIBDIR:STRING=lib # Skip default initialization by GNUInstallDirs CMake module
         ${ep_common_cmake_cache_args}
         ${tbb_cmake_cache_args}
+        ${ep_download_extract_timestamp_arg}
         -DCMAKE_BUILD_TYPE:STRING=Release
       BUILD_BYPRODUCTS "${TBB_DIR}/TBBConfig.cmake"
       USES_TERMINAL_DOWNLOAD 1
@@ -276,18 +282,14 @@ if(ITKPythonPackage_SUPERBUILD)
         -DWRAP_ITK_INSTALL_COMPONENT_PER_MODULE:BOOL=${install_component_per_module}
         -DITK_LEGACY_SILENT:BOOL=ON
         -DITK_WRAP_PYTHON:BOOL=ON
-        -DITK_WRAP_unsigned_short:BOOL=ON
-        -DITK_WRAP_double:BOOL=ON
-        -DITK_WRAP_complex_double:BOOL=ON
-        -DITK_WRAP_IMAGE_DIMS:STRING=2;3;4
-        -DITK_WRAP_DOC:BOOL=ON
         -DDOXYGEN_EXECUTABLE:FILEPATH=${DOXYGEN_EXECUTABLE}
         -DPython3_INCLUDE_DIR:PATH=${Python3_INCLUDE_DIR}
         -DPython3_LIBRARY:FILEPATH=${Python3_LIBRARY}
         -DPython3_EXECUTABLE:FILEPATH=${Python3_EXECUTABLE}
         ${ep_common_cmake_cache_args}
         ${tbb_args}
         ${ep_itk_cmake_cache_args}
+        ${ep_download_extract_timestamp_arg}
       USES_TERMINAL_DOWNLOAD 1
       USES_TERMINAL_UPDATE 1
       USES_TERMINAL_CONFIGURE 1

MANIFEST.in

@@ -1,4 +1,4 @@
-VERSION = '5.4rc2'
+VERSION = '5.4rc3'
 
 def get_versions():
     """Returns versions for the ITK Python package.

itk/__init__.py

@@ -1,2 +1,5 @@
-ninja==1.11.1
-scikit-build==0.17.6
+ninja==1.11.1.1
+scikit-build-core==0.8.2
+build==1.2.1
+pyproject-metadata
+pathspec

itkVersion.py

@@ -49,6 +49,9 @@
 # Handle case where the script directory is not the working directory
 script_dir=$(cd $(dirname $0) || exit 1; pwd)
 source "${script_dir}/dockcross-manylinux-set-vars.sh"
+source "${script_dir}/oci_exe.sh"
+
+oci_exe=$(ociExe)
 
 if [[ -n ${ITK_MODULE_PREQ} ]]; then
   echo "Building module dependencies ${ITK_MODULE_PREQ}"
@@ -81,14 +84,14 @@ if [[ "${TARGET_ARCH}" = "aarch64" ]]; then
     docker_prefix="sudo"
   fi
 
-  ${docker_prefix} docker run --privileged --rm tonistiigi/binfmt --install all
+  ${docker_prefix} $oci_exe run --privileged --rm tonistiigi/binfmt --install all
 
   # Build wheels
   DOCKER_ARGS+=" -v $(pwd):/work/ --rm"
-  ${docker_prefix} docker run $DOCKER_ARGS ${CONTAINER_SOURCE} "/ITKPythonPackage/scripts/internal/manylinux-aarch64-build-module-wheels.sh" "$@"
+  ${docker_prefix} $oci_exe run $DOCKER_ARGS ${CONTAINER_SOURCE} "/ITKPythonPackage/scripts/internal/manylinux-aarch64-build-module-wheels.sh" "$@"
 else
   # Generate dockcross scripts
-  docker run --rm ${CONTAINER_SOURCE} > /tmp/dockcross-manylinux-x64
+  $oci_exe run --rm ${CONTAINER_SOURCE} > /tmp/dockcross-manylinux-x64
   chmod u+x /tmp/dockcross-manylinux-x64
 
   # Build wheels

requirements-dev.txt

@@ -41,6 +41,7 @@ fi
 tar -c --to-stdout \
   ITKPythonPackage/ITK-* \
   ITKPythonPackage/oneTBB* \
+  ITKPythonPackage/requirements-dev.txt \
   ITKPythonPackage/scripts > ITKPythonBuilds-linux.tar
 $zstd_exe -f \
   -10 \

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

@@ -17,24 +17,26 @@
 #   export IMAGE_TAG=20221205-459c9f0
 #   scripts/dockcross-manylinux-build-module-wheels.sh cp39
 #
+script_dir=$(cd $(dirname $0) || exit 1; pwd)
+source "${script_dir}/oci_exe.sh"
+
+oci_exe=$(ociExe)
 
 MANYLINUX_VERSION=${MANYLINUX_VERSION:=_2_28}
 
 if [[ ${MANYLINUX_VERSION} == _2_28 ]]; then
-  IMAGE_TAG=${IMAGE_TAG:=20230926-9eb419c}
+  IMAGE_TAG=${IMAGE_TAG:=20240304-9e57d2b}
 elif [[ ${MANYLINUX_VERSION} == 2014 ]]; then
-  IMAGE_TAG=${IMAGE_TAG:=20230926-9eb419c}
+  IMAGE_TAG=${IMAGE_TAG:=20240304-9e57d2b}
 else
   echo "Unknown manylinux version ${MANYLINUX_VERSION}"
   exit 1;
 fi
 
 # Generate dockcross scripts
-docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
+$oci_exe run --rm docker.io/dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64
 chmod u+x /tmp/dockcross-manylinux-x64
 
-script_dir=$(cd $(dirname $0) || exit 1; pwd)
-
 # Build wheels
 pushd $script_dir/..
 mkdir -p dist

scripts/dockcross-manylinux-build-tarball.sh

@@ -39,11 +39,11 @@ TARGET_ARCH=${TARGET_ARCH:=x64}
 
 # Specialized manylinux image tag to use for building.
 if [[ ${MANYLINUX_VERSION} == _2_28 && ${TARGET_ARCH} == x64 ]]; then
-  IMAGE_TAG=${IMAGE_TAG:=20230926-9eb419c}
+  IMAGE_TAG=${IMAGE_TAG:=20240304-9e57d2b}
 elif [[ ${MANYLINUX_VERSION} == _2_28 && ${TARGET_ARCH} == aarch64 ]]; then
-  IMAGE_TAG=${IMAGE_TAG:=2022-11-19-1b19e81}
+  IMAGE_TAG=${IMAGE_TAG:=2024-03-25-9206bd9}
 elif [[ ${MANYLINUX_VERSION} == 2014 ]]; then
-  IMAGE_TAG=${IMAGE_TAG:=20230926-9eb419c}
+  IMAGE_TAG=${IMAGE_TAG:=20240304-9e57d2b}
 else
   echo "Unknown manylinux version ${MANYLINUX_VERSION}"
   exit 1;
@@ -52,7 +52,7 @@ fi
 # Set container for requested version/arch/tag.
 if [[ ${TARGET_ARCH} == x64 ]]; then
   MANYLINUX_IMAGE_NAME=${MANYLINUX_IMAGE_NAME:="manylinux${MANYLINUX_VERSION}-${TARGET_ARCH}:${IMAGE_TAG}"}
-  CONTAINER_SOURCE="dockcross/${MANYLINUX_IMAGE_NAME}"
+  CONTAINER_SOURCE="docker.io/dockcross/${MANYLINUX_IMAGE_NAME}"
 elif [[ ${TARGET_ARCH} == aarch64 ]]; then
   MANYLINUX_IMAGE_NAME=${MANYLINUX_IMAGE_NAME:="manylinux${MANYLINUX_VERSION}_${TARGET_ARCH}:${IMAGE_TAG}"}
   CONTAINER_SOURCE="quay.io/pypa/${MANYLINUX_IMAGE_NAME}"