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

Jump to bottom

ENH: Update to ITK 5.4 RC 01 #418

Merged
merged 2 commits into from
Jul 26, 2023
Merged

ENH: Update to ITK 5.4 RC 01 #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b4ca64
ENH: Update to ITK 5.4 RC 01
thewtex Jul 24, 2023
3370d2a
COMP: pandoc version for docs build
thewtex Jul 25, 2023
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
2 changes: 1 addition & 1 deletion .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.post2
itk>=5.4rc1
itkwidgets[lab,notebook]>=1.0a7
matplotlib
10 changes: 6 additions & 4 deletions .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: "37c107436f163436d9f9caf015b6f642eacdf651"
itk-git-tag: "v5.4rc01"

jobs:
build-test-cxx:
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Superbuild/External-ITK.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
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.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
)
Loading