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: Update to ITK 5.3 RC 4 #392

Merged
merged 3 commits into from
Aug 20, 2022
+10 −12
Merged

ENH: Update to ITK 5.3 RC 4 #392

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
b129e9d
ENH: Update to ITK 5.3 RC 4
thewtex Aug 12, 2022
7db9d97
COMP: Update itkwidgets to pre-release version
thewtex Aug 15, 2022
63257a3
ENH: Bump CI itk-git-tag to v5.3rc04
thewtex Aug 18, 2022
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
4 changes: 2 additions & 2 deletions .binder/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
itk>=5.3rc4
itkwidgets>=1.0a3
itk>=5.3rc4.post2
itkwidgets[lab,notebook]>=1.0a7
matplotlib
2 changes: 1 addition & 1 deletion .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: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
itk-git-tag: "v5.3rc04"

jobs:
build-test-cxx:
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.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
)
14 changes: 6 additions & 8 deletions src/Registration/Metricsv4/RegisterTwoPointSets/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()