Skip to content

Commit 4078f3f

Browse files
committed
ENH: Bump ITK version to 5.3.0
- find_package - Superbuild Git Tag - Superbuild Python package - CI version - Bump CMake policy versions to match ITK 5.3.0 - Testing data root CID (one new testing file) - Add estuary.tech gateway - Add GitHub Pages testing data resource
1 parent 788c0da commit 4078f3f

File tree

6 files changed

+20
-12
lines changed

6 files changed

+20
-12
lines changed

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

Lines changed: 5 additions & 5 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: "v5.3rc04"
6+
itk-git-tag: "v5.3.0"
77

88
jobs:
99
build-test-cxx:
@@ -42,7 +42,7 @@ jobs:
4242
python -m pip install ninja
4343
4444
- name: Get specific version of CMake, Ninja
45-
uses: lukka/get-cmake@v3.18.3
45+
uses: lukka/get-cmake@v3.19.2
4646

4747
- name: Download ITK
4848
run: |
@@ -146,7 +146,7 @@ jobs:
146146
cmake-build-type: "MinSizeRel"
147147

148148
steps:
149-
- uses: actions/checkout@v2
149+
- uses: actions/checkout@v3
150150
with:
151151
path: Ex
152152

@@ -161,7 +161,7 @@ jobs:
161161
python -m pip install ninja
162162
163163
- name: Get specific version of CMake, Ninja
164-
uses: lukka/get-cmake@v3.18.3
164+
uses: lukka/get-cmake@v3.19.2
165165

166166
- name: Fetch CTest driver script
167167
run: |
@@ -273,7 +273,7 @@ jobs:
273273
python-version: 3.8
274274

275275
- name: Get specific version of CMake, Ninja
276-
uses: lukka/get-cmake@v3.18.3
276+
uses: lukka/get-cmake@v3.19.2
277277

278278
- name: Install build dependencies
279279
run: |

CMake/ITKSphinxExamplesExternalData.cmake

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ list(APPEND ExternalData_OBJECT_STORES
2121
"${CMAKE_SOURCE_DIR}/.ExternalData"
2222
)
2323

24-
set(ITK_SPHINX_EXAMPLES_DATA_RELEASED_ROOT_CID bafybeicjaaz3xi2qso3kdirmy5ixoxegvfp3bm7o44ytoh6egj5m6wgeuu)
24+
set(ITK_SPHINX_EXAMPLES_DATA_RELEASED_ROOT_CID bafybeib6yijwyl52gkalx6griio2wsibowlrt3v5wmkkuqlnuvku64c3ra)
25+
2526
set(ExternalData_URL_ALGO_CID_lower cid)
2627
set(ExternalData_URL_TEMPLATES "" CACHE STRING
2728
"Additional URL templates for the ExternalData CMake script to look for testing data. E.g.
@@ -32,6 +33,10 @@ if(NOT ITK_FORBID_DOWNLOADS)
3233
# Local IPFS gateway
3334
"http://127.0.0.1:8080/ipfs/%(hash)"
3435

36+
# Data published on GitHub Pages (note: not complete due to file size
37+
# limit)
38+
"https://insightsoftwareconsortium.github.io/ITKTestingData/%(algo)/%(hash)"
39+
3540
# Released data rsync'd to Kitware's Apache web server
3641
"https://itk.org/files/ExternalData/%(algo)/%(hash)"
3742

@@ -45,6 +50,9 @@ if(NOT ITK_FORBID_DOWNLOADS)
4550
"https://${ITK_SPHINX_EXAMPLES_DATA_RELEASED_ROOT_CID}.ipfs.w3s.link/Objects/CID/%(hash)"
4651

4752
# Released data on estuary.tech
53+
"https://api.estuary.tech/gw/ipfs/${ITK_SPHINX_EXAMPLES_DATA_RELEASED_ROOT_CID}/Objects/CID/%(hash)"
54+
55+
# Protocol Labs gateway
4856
"https://${ITK_SPHINX_EXAMPLES_DATA_RELEASED_ROOT_CID}.ipfs.dweb.link/Objects/CID/%(hash)"
4957

5058
# Gateway for arbitrary new files, uploaded to web3.storage

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
# CMake versions greater than the ITKEX_NEWEST_VALIDATED_POLICIES_VERSION policies will
1111
# continue to generate policy warnings "CMake Warning (dev)...Policy CMP0XXX is not set:"
1212
#
13-
set(ITKEX_OLDEST_VALIDATED_POLICIES_VERSION "3.10.2")
14-
set(ITKEX_NEWEST_VALIDATED_POLICIES_VERSION "3.14.0")
13+
set(ITKEX_OLDEST_VALIDATED_POLICIES_VERSION "3.16.3")
14+
set(ITKEX_NEWEST_VALIDATED_POLICIES_VERSION "3.19.7")
1515
cmake_minimum_required(VERSION ${ITKEX_OLDEST_VALIDATED_POLICIES_VERSION} FATAL_ERROR)
1616
if("${CMAKE_VERSION}" VERSION_LESS_EQUAL "${ITKEX_NEWEST_VALIDATED_POLICIES_VERSION}")
1717
#Set and use the newest available cmake policies that are validated to work
@@ -80,7 +80,7 @@ endif()
8080
if(NOT ITK_VERSION)
8181
# To get the ITK version information from external package when building
8282
# stand alone, ITK is required.
83-
find_package(ITK 5.2.0 REQUIRED)
83+
find_package(ITK 5.3.0 REQUIRED)
8484
endif()
8585
set(ITKSphinxExamples_VERSION_MAJOR ${ITK_VERSION_MAJOR})
8686
set(ITKSphinxExamples_VERSION_MINOR ${ITK_VERSION_MINOR})

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Required
5959
^^^^^^^^
6060

6161
- CMake_ ( >= 3.10.2 )
62-
- ITK_ ( >= 5.2.0 )
62+
- ITK_ ( >= 5.3.0 )
6363

6464
Optional
6565
^^^^^^^^

Superbuild/External-ITK.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Get and build itk
33

44
if(NOT ITK_TAG)
5-
set(ITK_TAG "e801e637634d1cdf050b358299fd7b3771418f2e")
5+
set(ITK_TAG "v5.3.0")
66
endif()
77

88
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.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
20+
INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --ignore-installed itk>=5.3.0 sphinx==4.4.0 docutils<0.18 six black nbsphinx ipython 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)