Merge pull request #109 from KitwareMedical/bump-itk

ENH: Bump for ITK v5.3.0

Author: thewtex

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

@@ -2,55 +2,55 @@ name: Build, test, package
 
 on: [push,pull_request]
 
+env:
+  itk-git-tag: "v5.3.0"
+
 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-2022, macos-11]
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             c-compiler: "gcc"
             cxx-compiler: "g++"
-            itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
             cmake-build-type: "MinSizeRel"
-          - os: windows-2019
+          - os: windows-2022
             c-compiler: "cl.exe"
             cxx-compiler: "cl.exe"
-            itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
             cmake-build-type: "Release"
-          - os: macos-10.15
+          - os: macos-11
             c-compiler: "clang"
             cxx-compiler: "clang++"
-            itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
             cmake-build-type: "MinSizeRel"
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
 
     - name: Set up Python 3.8
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.8"
 
     - name: Install build dependencies
       run: |
         python -m pip install --upgrade pip
         python -m pip install ninja
 
     - name: Get specific version of CMake, Ninja
-      uses: lukka/get-cmake@v3.18.3
+      uses: lukka/get-cmake@v3.22.2
 
     - name: Download ITK
       run: |
         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'
+      if: matrix.os != 'windows-2022'
       run: |
         cd ..
         mkdir ITK-b
@@ -59,15 +59,15 @@ jobs:
         ninja
 
     - name: Build ITK
-      if: matrix.os == 'windows-2019'
+      if: matrix.os == 'windows-2022'
+      shell: cmd
       run: |
         cd ..
         mkdir ITK-b
         cd ITK-b
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
         cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF -DModule_RLEImage:BOOL=ON -GNinja ../ITK
         ninja
-      shell: cmd
 
     - name: Fetch CTest driver script
       run: |
@@ -83,7 +83,7 @@ jobs:
         file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/" CTEST_SOURCE_DIRECTORY)
         file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY)
         set(dashboard_source_name "${GITHUB_REPOSITORY}")
-        if(ENV{GITHUB_REF} MATCHES "master")
+        if((ENV{GITHUB_REF_NAME} MATCHES "master" OR ENV{GITHUB_REF_NAME} MATCHES "main"))
           set(branch "-master")
           set(dashboard_model "Continuous")
         else()
@@ -119,164 +119,18 @@ jobs:
         cat dashboard.cmake
 
     - name: Build and test
-      if: matrix.os != 'windows-2019'
+      if: matrix.os != 'windows-2022'
       run: |
         ctest --output-on-failure -j 2 -V -S dashboard.cmake
 
     - name: Build and test
-      if: matrix.os == 'windows-2019'
-      run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-        ctest --output-on-failure -j 2 -V -S dashboard.cmake
-      shell: cmd
-
-  build-linux-python-packages:
-    runs-on: ubuntu-20.04
-    strategy:
-      max-parallel: 2
-      matrix:
-        python-version: [37, 38, 39, 310]
-        include:
-          - itk-python-git-tag: "v5.3rc04"
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: 'Free up disk space'
-      run: |
-        # Workaround for https://github.com/actions/virtual-environments/issues/709
-        df -h
-        sudo apt-get clean
-        sudo rm -rf "/usr/local/share/boost"
-        sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-        df -h
-
-    - name: 'Fetch build script'
-      run: |
-        curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O
-        chmod u+x dockcross-manylinux-download-cache-and-build-module-wheels.sh
-
-    - name: 'Build 🐍 Python 📦 package'
-      run: |
-        export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
-        ./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
-
-    - name: Publish Python package as GitHub Artifact
-      uses: actions/upload-artifact@v1
-      with:
-        name: LinuxWheel${{ matrix.python-version }}
-        path: dist
-
-  build-macos-python-packages:
-    runs-on: macos-10.15
-    strategy:
-      max-parallel: 2
-      matrix:
-        include:
-          - itk-python-git-tag: "v5.3rc04"
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: 'Specific XCode version'
-      run: |
-        sudo xcode-select -s "/Applications/Xcode_11.7.app"
-
-    - name: Get specific version of CMake, Ninja
-      uses: lukka/[email protected]
-
-    - name: 'Fetch build script'
-      run: |
-        curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
-        chmod u+x macpython-download-cache-and-build-module-wheels.sh
-
-    - name: 'Build 🐍 Python 📦 package'
-      run: |
-        export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
-        export MACOSX_DEPLOYMENT_TARGET=10.9
-        ./macpython-download-cache-and-build-module-wheels.sh
-
-    - name: Publish Python package as GitHub Artifact
-      uses: actions/upload-artifact@v1
-      with:
-        name: MacOSWheels
-        path: dist
-
-  build-windows-python-packages:
-    runs-on: windows-2019
-    strategy:
-      max-parallel: 2
-      matrix:
-        python-version-minor: [7, 8, 9, 10]
-        include:
-          - itk-python-git-tag: "v5.3rc04"
-
-    steps:
-    - name: Get specific version of CMake, Ninja
-      uses: lukka/[email protected]
-
-    - uses: actions/checkout@v2
-      with:
-        path: "im"
-
-    - name: 'Install Python'
-      run: |
-        $pythonArch = "64"
-        $pythonVersion = "3.${{ matrix.python-version-minor }}"
-        iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/scikit-build/scikit-ci-addons/master/windows/install-python.ps1'))
-
-    - name: 'Fetch build dependencies'
-      shell: bash
-      run: |
-        mv im ../../
-        cd ../../
-        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"
-        7z x doxygen-1.8.11.windows.bin.zip -o/c/P/doxygen -aoa -r
-        curl -L "https://data.kitware.com/api/v1/file/5bbf87ba8d777f06b91f27d6/download/grep-win.zip" -o "grep-win.zip"
-        7z x grep-win.zip -o/c/P/grep -aoa -r
-
-    - name: 'Build 🐍 Python 📦 package'
+      if: matrix.os == 'windows-2022'
       shell: cmd
       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 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
-
-    - name: Publish Python package as GitHub Artifact
-      uses: actions/upload-artifact@v1
-      with:
-        name: WindowsWheel3.${{ matrix.python-version-minor }}
-        path: ../../im/dist
-
-  publish-python-packages-to-pypi:
-    needs:
-      - build-linux-python-packages
-      - build-macos-python-packages
-      - build-windows-python-packages
-    runs-on: ubuntu-18.04
-
-    steps:
-    - name: Download Python Packages
-      uses: actions/download-artifact@v2
-
-    - name: Prepare packages for upload
-      run: |
-        ls -R
-        for d in */; do
-          mv ${d}/*.whl .
-        done
-        mkdir dist
-        mv *.whl dist/
-        ls dist
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
+        ctest --output-on-failure -j 2 -V -S dashboard.cmake
 
-    - name: Publish 🐍 Python 📦 package to PyPI
-      if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_password }}
+  python-build-workflow:
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@b114bdd01a16855f57df0a973e665e61ac83355d
+    secrets:
+      pypi_password: ${{ secrets.pypi_password }}

setup.py

@@ -13,7 +13,7 @@
 
 setup(
     name='itk-morphologicalcontourinterpolation',
-    version='1.0.3',
+    version='1.1.0',
     author='Dženan Zukić',
     author_email='[email protected]',
     packages=['itk'],
@@ -49,6 +49,6 @@
     keywords='ITK InsightToolkit Segmentation Interpolation-methods',
     url=r'https://github.com/KitwareMedical/ITKMorphologicalContourInterpolation',
     install_requires=[
-        r'itk>=5.3rc3'
+        r'itk>=5.3.0'
     ]
     )