Skip to content

Commit 112e57e

Browse files
authored
Merge pull request #418 from thewtex/itk-5.4rc01
ENH: Update to ITK 5.4 RC 01
2 parents 5fb149d + 3370d2a commit 112e57e

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.binder/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
itk>=5.3rc4.post2
1+
itk>=5.4rc1
22
itkwidgets[lab,notebook]>=1.0a7
33
matplotlib

.github/workflows/build-test-publish.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build, test, publish
33
on: [push,pull_request]
44

55
env:
6-
itk-git-tag: "37c107436f163436d9f9caf015b6f642eacdf651"
6+
itk-git-tag: "v5.4rc01"
77

88
jobs:
99
build-test-cxx:
@@ -132,7 +132,7 @@ jobs:
132132
matrix:
133133
os: [ubuntu-22.04, windows-2022, macos-12]
134134
include:
135-
- os: ubuntu-20.04
135+
- os: ubuntu-22.04
136136
c-compiler: "gcc"
137137
cxx-compiler: "g++"
138138
cmake-build-type: "MinSizeRel"
@@ -242,7 +242,7 @@ jobs:
242242
run: |
243243
python -m pip install --upgrade pip
244244
python -m pip install ninja
245-
python -m pip install itk>=5.3.0
245+
python -m pip install itk>=5.4rc1
246246
python -m pip install matplotlib
247247
python -m pip install itkwidgets
248248
# Issues with 5.7.0
@@ -284,7 +284,9 @@ jobs:
284284
sudo apt-get update
285285
sudo apt-get install gnuplot dvipng
286286
sudo apt-get install texlive-full
287-
sudo apt-get install pandoc
287+
sudo apt-get install curl
288+
curl -LO https://github.com/jgm/pandoc/releases/download/3.1.6/pandoc-3.1.6-1-amd64.deb
289+
sudo apt-get install ./pandoc-3.1.6-1-amd64.deb
288290
sudo apt-get install imagemagick
289291
290292
python -m pip install --upgrade pip

Superbuild/External-ITK.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Get and build itk
33

44
if(NOT ITK_TAG)
5-
# ITK release 2022-12-05
6-
set(ITK_TAG "37c107436f163436d9f9caf015b6f642eacdf651")
5+
# ITK release 2023-06-20
6+
set(ITK_TAG "v5.4rc01")
77
endif()
88

99
set(_vtk_args)

Superbuild/External-Python.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ ExternalProject_Add(ITKPython
1717
DOWNLOAD_COMMAND ""
1818
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} -m venv "${_itk_venv}"
1919
BUILD_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --upgrade pip
20-
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
20+
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
2121
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/ITKBlackConfig.cmake
2222
)

0 commit comments

Comments
 (0)