-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #30 from InsightSoftwareConsortium/bump-itk
ENH: Bump to ITK v5.3rc04.post3
- Loading branch information
Showing
2 changed files
with
15 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,26 +3,27 @@ name: Build, test, package | |
on: [push,pull_request] | ||
|
||
env: | ||
itk-git-tag: "835dc01388d22c4b4c9a46b01dbdfe394ec23511" | ||
itk-wheel-tag: "v5.3rc04.post2" # Same ITK C++ reference commit, different tag name | ||
itk-git-tag: "171fb2ba33a87041f99328a2f26612ff33aa9cc8" | ||
itk-wheel-tag: "v5.3rc04.post3" # Same ITK C++ reference commit, different tag name | ||
ITKMeshToPolyData-git-tag: "v0.9.1" | ||
|
||
jobs: | ||
build-test-cxx: | ||
runs-on: ${{ matrix.os }} | ||
strategy: | ||
max-parallel: 3 | ||
matrix: | ||
os: [ubuntu-18.04, windows-2019, macos-10.15] | ||
os: [ubuntu-20.04, windows-2019, macos-11] | ||
include: | ||
- os: ubuntu-18.04 | ||
- os: ubuntu-20.04 | ||
c-compiler: "gcc" | ||
cxx-compiler: "g++" | ||
cmake-build-type: "MinSizeRel" | ||
- os: windows-2019 | ||
c-compiler: "cl.exe" | ||
cxx-compiler: "cl.exe" | ||
cmake-build-type: "Release" | ||
- os: macos-10.15 | ||
- os: macos-11 | ||
c-compiler: "clang" | ||
cxx-compiler: "clang++" | ||
cmake-build-type: "MinSizeRel" | ||
|
@@ -157,6 +158,7 @@ jobs: | |
- name: 'Build 🐍 Python 📦 package' | ||
run: | | ||
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }} | ||
export TARBALL_SPECIALIZATION="-manylinux_2_28" | ||
pwd | ||
git clone https://github.com/InsightSoftwareConsortium/ITKMeshToPolyData.git | ||
echo "Building ITKMeshToPolyData dependency" | ||
|
@@ -166,7 +168,7 @@ jobs: | |
./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }} | ||
popd | ||
cp ITKMeshToPolyData/include/* include/ | ||
rm ./ITKMeshToPolyData/ITKPythonBuilds-linux.tar.zst | ||
rm -f ./ITKMeshToPolyData/ITKPythonBuilds-linux.tar.zst | ||
mv ./ITKMeshToPolyData/ITKPythonPackage . | ||
echo "Building ITKBSplineGradient" | ||
./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }} | ||
|
@@ -178,7 +180,7 @@ jobs: | |
path: dist | ||
|
||
build-macos-python-packages: | ||
runs-on: macos-10.15 | ||
runs-on: macos-11 | ||
strategy: | ||
max-parallel: 2 | ||
|
||
|
@@ -187,7 +189,7 @@ jobs: | |
|
||
- name: 'Specific XCode version' | ||
run: | | ||
sudo xcode-select -s "/Applications/Xcode_11.7.app" | ||
sudo xcode-select -s "/Applications/Xcode_13.2.1.app" | ||
- name: Get specific version of CMake, Ninja | ||
uses: lukka/[email protected] | ||
|
@@ -210,7 +212,7 @@ jobs: | |
./macpython-download-cache-and-build-module-wheels.sh | ||
popd | ||
cp ITKMeshToPolyData/include/* include/ | ||
rm ./ITKMeshToPolyData/ITKPythonBuilds-macosx.tar.zst | ||
rm -f ./ITKMeshToPolyData/ITKPythonBuilds-macosx.tar.zst | ||
echo "Building ITKBSplineGradient" | ||
./macpython-download-cache-and-build-module-wheels.sh | ||
|
@@ -284,7 +286,7 @@ jobs: | |
- build-linux-python-packages | ||
- build-macos-python-packages | ||
- build-windows-python-packages | ||
runs-on: ubuntu-18.04 | ||
runs-on: ubuntu-20.04 | ||
|
||
steps: | ||
- name: Download Python Packages | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ | |
|
||
setup( | ||
name='itk-bsplinegradient', | ||
version='0.2.8', | ||
version='0.2.9', | ||
author='Matthew McCormick', | ||
author_email='[email protected]', | ||
packages=['itk'], | ||
|
@@ -46,6 +46,7 @@ | |
keywords='ITK InsightToolkit Image-Gradient B-spline', | ||
url=r'https://github.com/InsightSoftwareConsortium/ITKBSplineGradient', | ||
install_requires=[ | ||
r'itk>=v5.3rc04.post2' | ||
r'itk>=v5.3rc04.post3', | ||
r'itk-meshtopolydata>=v0.9.1' | ||
] | ||
) |