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.

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

ENH: Bump to ITK v5.3rc04 #192

Merged
merged 3 commits into from
Apr 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 7 additions & 15 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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/
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down Expand Up @@ -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',
Expand Down