From b129e9dbb8fb5d6ed90df4968f2271305ea25a69 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Fri, 12 Aug 2022 15:12:09 -0400 Subject: [PATCH 1/3] ENH: Update to ITK 5.3 RC 4 --- .binder/requirements.txt | 2 +- Superbuild/External-Python.cmake | 2 +- .../Metricsv4/RegisterTwoPointSets/CMakeLists.txt | 14 ++++++-------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.binder/requirements.txt b/.binder/requirements.txt index 9b5a943b1..18f8c3915 100644 --- a/.binder/requirements.txt +++ b/.binder/requirements.txt @@ -1,3 +1,3 @@ -itk>=5.3rc4 +itk>=5.3rc4.post2 itkwidgets>=1.0a3 matplotlib diff --git a/Superbuild/External-Python.cmake b/Superbuild/External-Python.cmake index ffd0f1c99..0992e7fbb 100644 --- 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.3rc4 sphinx==4.4.0 docutils<0.18 six black nbsphinx ipython sphinx-contributors ipykernel matplotlib itkwidgets pydata-sphinx-theme + INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --ignore-installed itk>=5.3rc4.post2 sphinx==4.4.0 docutils<0.18 six black nbsphinx ipython sphinx-contributors ipykernel matplotlib itkwidgets pydata-sphinx-theme COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/ITKBlackConfig.cmake ) diff --git a/src/Registration/Metricsv4/RegisterTwoPointSets/CMakeLists.txt b/src/Registration/Metricsv4/RegisterTwoPointSets/CMakeLists.txt index ec88f5b57..626f7f19d 100644 --- a/src/Registration/Metricsv4/RegisterTwoPointSets/CMakeLists.txt +++ b/src/Registration/Metricsv4/RegisterTwoPointSets/CMakeLists.txt @@ -23,13 +23,11 @@ install(FILES Code.cxx Code.py CMakeLists.txt enable_testing() add_test(NAME RegisterTwoPointSetsTest COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME}) - + if(ITK_WRAP_PYTHON) - # TODO broken in itk v5.3rc03 - # repaired after itk v5.3rc04 - #add_test(NAME RegisterTwoPointSetsTest2DPython - # COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py 2 - # ) - #add_test(NAME RegisterTwoPointSetsTest3DPython - # COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py 3) + add_test(NAME RegisterTwoPointSetsTest2DPython + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py 2 + ) + add_test(NAME RegisterTwoPointSetsTest3DPython + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py 3) endif() From 7db9d97bc6678efcbf052287b93dafe312573194 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 15 Aug 2022 17:17:00 -0400 Subject: [PATCH 2/3] COMP: Update itkwidgets to pre-release version Remove itk-meshtopolydata dependency, which is causing conflicts. --- .binder/requirements.txt | 2 +- Superbuild/External-Python.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.binder/requirements.txt b/.binder/requirements.txt index 18f8c3915..1d5c3330c 100644 --- a/.binder/requirements.txt +++ b/.binder/requirements.txt @@ -1,3 +1,3 @@ itk>=5.3rc4.post2 -itkwidgets>=1.0a3 +itkwidgets[lab,notebook]>=1.0a7 matplotlib diff --git a/Superbuild/External-Python.cmake b/Superbuild/External-Python.cmake index 0992e7fbb..796494bc8 100644 --- 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.3rc4.post2 sphinx==4.4.0 docutils<0.18 six black nbsphinx ipython sphinx-contributors ipykernel matplotlib itkwidgets pydata-sphinx-theme + INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --ignore-installed itk>=5.3rc4.post2 sphinx==4.4.0 docutils<0.18 six black nbsphinx ipython sphinx-contributors ipykernel matplotlib itkwidgets[lab,notebook]>=1.0a7 pydata-sphinx-theme COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/ITKBlackConfig.cmake ) From 63257a3e75510dfd94fcd03559d74d9cbaddf53c Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Thu, 18 Aug 2022 18:16:02 -0400 Subject: [PATCH 3/3] ENH: Bump CI itk-git-tag to v5.3rc04 --- .github/workflows/build-test-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index b18292156..52c0f036f 100644 --- 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: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" + itk-git-tag: "v5.3rc04" jobs: build-test-cxx: