From af9e9b1bd5bd691e9cdf5528917e52201cef16b4 Mon Sep 17 00:00:00 2001 From: Thibault Pelletier Date: Wed, 27 May 2026 16:52:40 +0200 Subject: [PATCH] feat: wip: add support for native layer-dm --- .github/workflows/cd.yml | 6 +++--- .github/workflows/ci.yml | 2 +- common.py | 4 ++-- patch/SlicerCore/pyproject.toml | 6 +++--- patch/SlicerCore/tests/packages/build_module/pyproject.toml | 2 +- patch/SlicerCore/tests/packages/find_package/pyproject.toml | 2 +- patch/SlicerCoreSDK/pyproject.toml | 6 +++--- patch/SuperBuild/External_vtkAddon.cmake | 6 ++++-- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index e99fdb8..6354a92 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -9,7 +9,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest, macos-15] py-abi: ['cp310'] - vtk-tag: ['9.6.0'] + vtk-tag: ['9.6.2'] include: # Python version to install on host - py-abi: cp310 @@ -39,8 +39,8 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest, macos-15] - py-abi: ['cp311', 'cp312', 'cp313'] - vtk-tag: ['9.6.0'] + py-abi: ['cp311', 'cp312', 'cp313', 'cp314'] + vtk-tag: ['9.6.2'] include: # Python version to install on host - py-abi: cp311 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95a366a..367a17f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest, macos-15] - vtk-tag: ['9.6.0'] + vtk-tag: ['9.6.2'] include: # OS name to ciwheelbuild platform name - os: ubuntu-latest platform-tag: manylinux_2_28_x86_64 diff --git a/common.py b/common.py index 836e8e4..0dc6b88 100644 --- a/common.py +++ b/common.py @@ -1,6 +1,6 @@ # Baseline Slicer repository, change this when rebasing -GIT_URL = "https://github.com/Slicer/Slicer.git" -GIT_REVISION = "55f38b57fc9d9a80da0fce51aa12d82064c101cc" +GIT_URL = "https://github.com/Thibault-Pelletier/Slicer.git" +GIT_REVISION = "05c72f73907ebeec43db794f34dbf2a38a1f3b0c" # Directories used by the scripts SLICER_DIR = "Slicer" diff --git a/patch/SlicerCore/pyproject.toml b/patch/SlicerCore/pyproject.toml index 0d37416..b2a69af 100644 --- a/patch/SlicerCore/pyproject.toml +++ b/patch/SlicerCore/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "scikit-build-core", - "vtk-sdk==9.6.0", + "vtk-sdk==9.6.2", "vtk-sdk-python-wheel-helper" ] build-backend = "scikit_build_core.build" @@ -13,8 +13,8 @@ cmake.args = ["-GNinja", "-DCMAKE_BUILD_TYPE=Release", "-DBUILD_SDK=OFF"] [project] name = "slicer-core" -version = "5.11.0.6" -dependencies = ["vtk==9.6.0"] +version = "5.12.0.0" +dependencies = ["vtk==9.6.2"] requires-python = ">=3.10" readme = "README.md" license = { text = "Apache 2.0 License" } diff --git a/patch/SlicerCore/tests/packages/build_module/pyproject.toml b/patch/SlicerCore/tests/packages/build_module/pyproject.toml index 4d4c7c6..63fefbc 100644 --- a/patch/SlicerCore/tests/packages/build_module/pyproject.toml +++ b/patch/SlicerCore/tests/packages/build_module/pyproject.toml @@ -3,7 +3,7 @@ requires = [ "scikit-build-core", "vtk-sdk-python-wheel-helper", "slicer-core-sdk", - "vtk-sdk==9.6.0" + "vtk-sdk==9.6.2" ] build-backend = "scikit_build_core.build" diff --git a/patch/SlicerCore/tests/packages/find_package/pyproject.toml b/patch/SlicerCore/tests/packages/find_package/pyproject.toml index 67a5d9c..c3fa6ac 100644 --- a/patch/SlicerCore/tests/packages/find_package/pyproject.toml +++ b/patch/SlicerCore/tests/packages/find_package/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "scikit-build-core", "slicer-core-sdk", - "vtk-sdk==9.6.0" + "vtk-sdk==9.6.2" ] build-backend = "scikit_build_core.build" diff --git a/patch/SlicerCoreSDK/pyproject.toml b/patch/SlicerCoreSDK/pyproject.toml index dd9b518..a6d6d40 100644 --- a/patch/SlicerCoreSDK/pyproject.toml +++ b/patch/SlicerCoreSDK/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ "scikit-build-core", - "vtk-sdk==9.6.0", + "vtk-sdk==9.6.2", "vtk-sdk-python-wheel-helper" ] build-backend = "scikit_build_core.build" @@ -13,8 +13,8 @@ cmake.args = ["-GNinja", "-DCMAKE_BUILD_TYPE=Release", "-DBUILD_SDK=ON"] [project] name = "slicer-core-sdk" -version = "5.11.0.6" -dependencies = ["vtk==9.6.0"] +version = "5.12.0.0" +dependencies = ["vtk==9.6.2"] requires-python = ">=3.10" readme = "README.md" license = { text = "Apache 2.0 License" } diff --git a/patch/SuperBuild/External_vtkAddon.cmake b/patch/SuperBuild/External_vtkAddon.cmake index f1b0214..e24538a 100644 --- a/patch/SuperBuild/External_vtkAddon.cmake +++ b/patch/SuperBuild/External_vtkAddon.cmake @@ -11,13 +11,13 @@ if(NOT DEFINED vtkAddon_DIR AND NOT Slicer_USE_SYSTEM_${proj}) ExternalProject_SetIfNotDefined( Slicer_${proj}_GIT_REPOSITORY - "${EP_GIT_PROTOCOL}://github.com/AlexyPellegrini/vtkAddon.git" + "${EP_GIT_PROTOCOL}://github.com/Slicer/vtkAddon.git" QUIET ) ExternalProject_SetIfNotDefined( Slicer_${proj}_GIT_TAG - "python-dev-cmake" + "main" QUIET ) @@ -58,6 +58,8 @@ if(NOT DEFINED vtkAddon_DIR AND NOT Slicer_USE_SYSTEM_${proj}) -DCMAKE_INSTALL_PREFIX:PATH=${EP_INSTALL_DIR} -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=OFF + -DvtkAddon_INSTALL_INCLUDE_DIR:STRING=include + -DvtkAddon_INSTALL_NO_DEVELOPMENT:BOOL=OFF -DvtkAddon_USE_UTF8:BOOL=ON -DvtkAddon_CMAKE_DIR:PATH=${EP_SOURCE_DIR}/CMake -DvtkAddon_LAUNCH_COMMAND:STRING=${Slicer_LAUNCH_COMMAND}