diff --git a/.binder/requirements.txt b/.binder/requirements.txt index 9b5a943b1..1d5c3330c 100644 --- a/.binder/requirements.txt +++ b/.binder/requirements.txt @@ -1,3 +1,3 @@ -itk>=5.3rc4 -itkwidgets>=1.0a3 +itk>=5.3rc4.post2 +itkwidgets[lab,notebook]>=1.0a7 matplotlib 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: diff --git a/Superbuild/External-Python.cmake b/Superbuild/External-Python.cmake index ffd0f1c99..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 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 ) 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()