diff --git a/.binder/requirements.txt b/.binder/requirements.txt index 1d5c3330c..b931f9f10 100644 --- a/.binder/requirements.txt +++ b/.binder/requirements.txt @@ -1,3 +1,3 @@ -itk>=5.3rc4.post2 +itk>=5.4rc1 itkwidgets[lab,notebook]>=1.0a7 matplotlib diff --git a/.github/workflows/build-test-publish.yml b/.github/workflows/build-test-publish.yml index a7f704061..f8739402a 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: "37c107436f163436d9f9caf015b6f642eacdf651" + itk-git-tag: "v5.4rc01" jobs: build-test-cxx: @@ -132,7 +132,7 @@ jobs: matrix: os: [ubuntu-22.04, windows-2022, macos-12] include: - - os: ubuntu-20.04 + - os: ubuntu-22.04 c-compiler: "gcc" cxx-compiler: "g++" cmake-build-type: "MinSizeRel" @@ -242,7 +242,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install ninja - python -m pip install itk>=5.3.0 + python -m pip install itk>=5.4rc1 python -m pip install matplotlib python -m pip install itkwidgets # Issues with 5.7.0 @@ -284,7 +284,9 @@ jobs: sudo apt-get update sudo apt-get install gnuplot dvipng sudo apt-get install texlive-full - sudo apt-get install pandoc + sudo apt-get install curl + curl -LO https://github.com/jgm/pandoc/releases/download/3.1.6/pandoc-3.1.6-1-amd64.deb + sudo apt-get install ./pandoc-3.1.6-1-amd64.deb sudo apt-get install imagemagick python -m pip install --upgrade pip diff --git a/Superbuild/External-ITK.cmake b/Superbuild/External-ITK.cmake index 362f19614..14a8f9869 100644 --- a/Superbuild/External-ITK.cmake +++ b/Superbuild/External-ITK.cmake @@ -2,8 +2,8 @@ # Get and build itk if(NOT ITK_TAG) - # ITK release 2022-12-05 - set(ITK_TAG "37c107436f163436d9f9caf015b6f642eacdf651") + # ITK release 2023-06-20 + set(ITK_TAG "v5.4rc01") endif() set(_vtk_args) diff --git a/Superbuild/External-Python.cmake b/Superbuild/External-Python.cmake index 8db600b32..e065c07d7 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.3.0 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.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 COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/ITKBlackConfig.cmake )