Merge pull request #192 from tbirdso/bump-itk

ENH: Bump to ITK v5.3rc04
KitwareMedical · Apr 14, 2022 · 8cacf76 · 8cacf76
2 parents 0094c63 + 2ba0431
commit 8cacf76
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
@@ -3,6 +3,8 @@ name: Build, test, package
 on: [push,pull_request]
 
 env:
+  itk-git-tag: "801370c025c7d296783481779a41c6d559c992c5"
+  itk-wheel-tag: "v5.3rc04"
   ITKBSplineGradient-git-tag: v0.2.4
   ITKHigherOrderAccurateGradient-git-tag: v1.1.0
   ITKSplitComponents-git-tag: v2.0.4
@@ -19,17 +21,14 @@ jobs:
           - os: ubuntu-18.04
             c-compiler: "gcc"
             cxx-compiler: "g++"
-            itk-git-tag: "v5.3rc03"
             cmake-build-type: "MinSizeRel"
           - os: windows-2019
             c-compiler: "cl.exe"
             cxx-compiler: "cl.exe"
-            itk-git-tag: "v5.3rc03"
             cmake-build-type: "Release"
           - os: macos-10.15
             c-compiler: "clang"
             cxx-compiler: "clang++"
-            itk-git-tag: "v5.3rc03"
             cmake-build-type: "MinSizeRel"
 
     steps:
@@ -53,7 +52,7 @@ jobs:
         cd ..
         git clone https://github.com/InsightSoftwareConsortium/ITK.git
         cd ITK
-        git checkout ${{ matrix.itk-git-tag }}
+        git checkout ${{ env.itk-git-tag }}
 
     - name: Build ITK
       if: matrix.os != 'windows-2019'
@@ -141,8 +140,6 @@ jobs:
       max-parallel: 2
       matrix:
         python-version: [37, 38, 39, 310]
-        include:
-          - itk-python-git-tag: "v5.3rc03"
 
     steps:
     - uses: actions/checkout@v2
@@ -168,7 +165,7 @@ jobs:
 
     - name: 'Build 🐍 Python 📦 package'
       run: |
-        export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
+        export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
         git clone https://github.com/InsightSoftwareConsortium/ITKBSplineGradient.git
         cp ./dockcross-manylinux-download-cache-and-build-module-wheels.sh ./ITKBSplineGradient
         pushd ITKBSplineGradient
@@ -218,9 +215,6 @@ jobs:
     runs-on: macos-10.15
     strategy:
       max-parallel: 2
-      matrix:
-        include:
-          - itk-python-git-tag: "v5.3rc03"
 
     steps:
     - uses: actions/checkout@v2
@@ -239,7 +233,7 @@ jobs:
 
     - name: 'Build 🐍 Python 📦 package'
       run: |
-        export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
+        export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
         export MACOSX_DEPLOYMENT_TARGET=10.9
         git clone https://github.com/InsightSoftwareConsortium/ITKBSplineGradient
         cp ./macpython-download-cache-and-build-module-wheels.sh ITKBSplineGradient/
@@ -281,8 +275,6 @@ jobs:
       max-parallel: 2
       matrix:
         python-version-minor: [7, 8, 9, 10]
-        include:
-          - itk-python-git-tag: "v5.3rc03"
 
     steps:
     - name: Get specific version of CMake, Ninja
@@ -303,7 +295,7 @@ jobs:
       run: |
         mv im ../../
         cd ../../im
-        curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
+        curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ env.itk-wheel-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
         7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
         curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
         7z x doxygen-1.8.11.windows.bin.zip -o/c/P/doxygen -aoa -r
@@ -319,7 +311,7 @@ jobs:
       run: |
         cd ../../im
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-        set PATH="C:\P\grep;%PATH%"
+        set PATH=C:\P\grep;%PATH%
         set CC=cl.exe
         set CXX=cl.exe
         cd ITKBSplineGradient

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name='itk-ultrasound',
-    version='0.5.2',
+    version='0.5.3',
     author='Matthew McCormick',
     author_email='matt.mccormick@kitware.com',
     packages=['itk'],
@@ -41,7 +41,7 @@
     keywords='ITK InsightToolkit ultrasound imaging',
     url=r'http://www.insight-journal.org/browse/publication/722',
     install_requires=[
-        r'itk>=5.3rc03',
+        r'itk>=5.3rc04',
         r'itk-bsplinegradient>=0.2.4',
         r'itk-higherorderaccurategradient>=1.1.0',
         r'itk-splitcomponents>=2.0.4',