Merge pull request #419 from thewtex/itk-5.4rc02

ENH: Bump ITK to 5.4 Release Candidate 2
InsightSoftwareConsortium · Oct 30, 2023 · 1b2e558 · 1b2e558 · github-actions · Oct 31, 2023
2 parents 112e57e + db481ba
commit 1b2e558
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.binder/requirements.txt b/.binder/requirements.txt
@@ -1,3 +1,3 @@
-itk>=5.4rc1
+itk>=5.4rc2
 itkwidgets[lab,notebook]>=1.0a7
 matplotlib
diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml
@@ -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:
@@ -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

diff --git a/Superbuild/External-ITK.cmake b/Superbuild/External-ITK.cmake
@@ -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)

diff --git a/Superbuild/External-Python.cmake b/Superbuild/External-Python.cmake
@@ -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
   )
diff --git a/src/Filtering/LabelMap/ConvertImageWithLabelsToShapeLabelMap/CMakeLists.txt b/src/Filtering/LabelMap/ConvertImageWithLabelsToShapeLabelMap/CMakeLists.txt
@@ -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()