Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common.py
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions patch/SlicerCore/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions patch/SlicerCoreSDK/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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" }
Expand Down
6 changes: 4 additions & 2 deletions patch/SuperBuild/External_vtkAddon.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down Expand Up @@ -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}
Expand Down
Loading