From a5b9a2a534702b6de8d48914a8f34bd84c3088c5 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 2 May 2022 15:49:36 -0400 Subject: [PATCH 1/2] ENH: Build against ITK 5.3-RC3 --- .github/workflows/build-test-package.yml | 26 ++++++++++++------------ setup.py | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index b9c352d..9262209 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -8,26 +8,26 @@ jobs: strategy: max-parallel: 3 matrix: - os: [ubuntu-18.04, windows-2019, macos-10.15] + os: [ubuntu-20.04, windows-2019, macos-10.15] include: - - os: ubuntu-18.04 + - os: ubuntu-20.04 c-compiler: "gcc" cxx-compiler: "g++" - itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe" + itk-git-tag: "v5.3rc03" cmake-build-type: "MinSizeRel" - os: windows-2019 c-compiler: "cl.exe" cxx-compiler: "cl.exe" - itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe" + itk-git-tag: "v5.3rc03" cmake-build-type: "Release" - os: macos-10.15 c-compiler: "clang" cxx-compiler: "clang++" - itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe" + itk-git-tag: "v5.3rc03" cmake-build-type: "MinSizeRel" steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Set up Python 3.8 uses: actions/setup-python@v2 @@ -134,9 +134,9 @@ jobs: strategy: max-parallel: 2 matrix: - python-version: [36, 37, 38, 39] + python-version: [37, 38, 39, 310] include: - - itk-python-git-tag: "v5.2.1.post1" + - itk-python-git-tag: "v5.3rc03" steps: - uses: actions/checkout@v2 @@ -172,7 +172,7 @@ jobs: max-parallel: 2 matrix: include: - - itk-python-git-tag: "v5.2.1.post1" + - itk-python-git-tag: "v5.3rc03" steps: - uses: actions/checkout@v2 @@ -206,9 +206,9 @@ jobs: strategy: max-parallel: 2 matrix: - python-version-minor: [6, 7, 8, 9] + python-version-minor: [7, 8, 9, 10] include: - - itk-python-git-tag: "v5.2.1.post1" + - itk-python-git-tag: "v5.3rc03" steps: - name: Get specific version of CMake, Ninja @@ -228,7 +228,7 @@ jobs: shell: bash run: | mv im ../../ - cd ../../ + cd ../../im curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-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" @@ -257,7 +257,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 diff --git a/setup.py b/setup.py index 344be6b..211c61b 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,6 @@ keywords='ITK Strain Tensor Displacement Field', url=r'https://github.com/InsightSoftwareConsortium/ITKStrain', install_requires=[ - r'itk>=5.2.1.post1' + r'itk>=5.3rc03' ] ) From 85dcfe01d67091a07e038ce21af548075e7c88d2 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Tue, 3 May 2022 13:41:24 -0400 Subject: [PATCH 2/2] ENH: Build against pre-ITK 5.3RC4 --- .github/workflows/build-test-package.yml | 24 +++++++++--------------- setup.py | 2 +- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 9262209..25de1e7 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -2,6 +2,10 @@ name: Build, test, package on: [push,pull_request] +env: + itk-git-tag: "801370c025c7d296783481779a41c6d559c992c5" + itk-wheel-tag: "v5.3rc04" + jobs: build-test-cxx: runs-on: ${{ matrix.os }} @@ -13,17 +17,14 @@ jobs: - os: ubuntu-20.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: @@ -47,7 +48,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' @@ -135,8 +136,6 @@ jobs: max-parallel: 2 matrix: python-version: [37, 38, 39, 310] - include: - - itk-python-git-tag: "v5.3rc03" steps: - uses: actions/checkout@v2 @@ -157,7 +156,7 @@ jobs: - name: 'Build 🐍 Python 📦 package' run: | - export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }} + export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }} ./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }} - name: Publish Python package as GitHub Artifact @@ -170,9 +169,6 @@ jobs: runs-on: macos-10.15 strategy: max-parallel: 2 - matrix: - include: - - itk-python-git-tag: "v5.3rc03" steps: - uses: actions/checkout@v2 @@ -191,7 +187,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 ./macpython-download-cache-and-build-module-wheels.sh @@ -207,8 +203,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 @@ -229,7 +223,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 @@ -241,7 +235,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 C:\Python3${{ matrix.python-version-minor }}-x64\python.exe C:\P\IPP\scripts\windows_build_module_wheels.py --py-envs "3${{ matrix.python-version-minor }}-x64" --no-cleanup diff --git a/setup.py b/setup.py index 211c61b..63777ff 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,6 @@ keywords='ITK Strain Tensor Displacement Field', url=r'https://github.com/InsightSoftwareConsortium/ITKStrain', install_requires=[ - r'itk>=5.3rc03' + r'itk>=5.3rc4' ] )