Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ENH: Bump ITK to 5.4 Release Candidate 2 #419

Merged
merged 3 commits into from
Oct 30, 2023
+13 −8
Merged

ENH: Bump ITK to 5.4 Release Candidate 2 #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e404022
ENH: Bump ITK to 5.4 Release Candidate 2
thewtex Oct 20, 2023
84fb315
ENH: Add PASS_REGULAR_EXPRESION to ConvertImageWithLabelsToShapeLabelMap
thewtex Oct 30, 2023
db481ba
BUG: Disable ConvertImageWithLabelsToShapeLabelMapTest on Windows
thewtex Oct 30, 2023
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
2 changes: 1 addition & 1 deletion .binder/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
itk>=5.4rc1
itk>=5.4rc2
itkwidgets[lab,notebook]>=1.0a7
matplotlib
4 changes: 2 additions & 2 deletions .github/workflows/build-test-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build, test, publish
on: [push,pull_request]

env:
itk-git-tag: "v5.4rc01"
itk-git-tag: "v5.4rc02"

jobs:
build-test-cxx:
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:
run: |
python -m pip install --upgrade pip
python -m pip install ninja
python -m pip install itk>=5.4rc1
python -m pip install itk>=5.4rc2
python -m pip install matplotlib
python -m pip install itkwidgets
# Issues with 5.7.0
Expand Down
4 changes: 2 additions & 2 deletions Superbuild/External-ITK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Get and build itk

if(NOT ITK_TAG)
# ITK release 2023-06-20
set(ITK_TAG "v5.4rc01")
# ITK release 2023-10-10
set(ITK_TAG "v5.4rc02")
endif()

set(_vtk_args)
Expand Down
2 changes: 1 addition & 1 deletion Superbuild/External-Python.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ ExternalProject_Add(ITKPython
DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} -m venv "${_itk_venv}"
BUILD_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --upgrade pip
INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --ignore-installed itk>=5.4rc1 sphinx==4.4.0 docutils<0.18 traitlets==5.6.0 six black nbsphinx ipywidgets sphinx-contributors ipykernel matplotlib itkwidgets[lab,notebook]>=1.0a21 pydata-sphinx-theme
INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --ignore-installed itk>=5.4rc2 sphinx==4.4.0 docutils<0.18 traitlets==5.6.0 six black nbsphinx ipywidgets sphinx-contributors ipykernel matplotlib itkwidgets[lab,notebook]>=1.0a21 pydata-sphinx-theme
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/ITKBlackConfig.cmake
)
9 changes: 7 additions & 2 deletions src/Filtering/LabelMap/ConvertImageWithLabelsToShapeLabelMap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,10 @@ install(FILES Code.cxx CMakeLists.txt


enable_testing()
add_test(NAME ConvertImageWithLabelsToShapeLabelMapTest
COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME})
# Windows failures tracked: https://github.com/InsightSoftwareConsortium/ITKSphinxExamples/issues/420
if (NOT WIN32)
add_test(NAME ConvertImageWithLabelsToShapeLabelMapTest
COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME})
set_tests_properties(ConvertImageWithLabelsToShapeLabelMapTest
PROPERTIES PASS_REGULAR_EXPRESSION "There are 2 objects.")
endif()