Merge pull request #114 from aylward/BumpITKv4.5rc2

ENH: Bump setup.py and CI to use ITK v5.4 rc2
KitwareMedical · Apr 17, 2024 · fc7ffdc · fc7ffdc
2 parents 25ad01c + 77aa1f7
commit fc7ffdc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 129 deletions.
diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml
@@ -2,135 +2,15 @@ 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-20.04, windows-2022, macos-11]
-        include:
-          - os: ubuntu-20.04
-            c-compiler: "gcc"
-            cxx-compiler: "g++"
-            cmake-build-type: "MinSizeRel"
-          - os: windows-2022
-            c-compiler: "cl.exe"
-            cxx-compiler: "cl.exe"
-            cmake-build-type: "Release"
-          - os: macos-11
-            c-compiler: "clang"
-            cxx-compiler: "clang++"
-            cmake-build-type: "MinSizeRel"
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        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/[email protected]
-
-    - name: Download ITK
-      run: |
-        cd ..
-        git clone https://github.com/InsightSoftwareConsortium/ITK.git
-        cd ITK
-        git checkout ${{ env.itk-git-tag }}
-
-    - name: Build ITK
-      if: matrix.os != 'windows-2022'
-      run: |
-        cd ..
-        mkdir ITK-b
-        cd ITK-b
-        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
-
-    - name: Build ITK
-      if: matrix.os == 'windows-2022'
-      shell: cmd
-      run: |
-        cd ..
-        mkdir ITK-b
-        cd ITK-b
-        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
-
-    - name: Fetch CTest driver script
-      run: |
-        curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITK/dashboard/itk_common.cmake -O
-
-    - name: Configure CTest script
-      shell: bash
-      run: |
-        operating_system="${{ matrix.os }}"
-        cat > dashboard.cmake << EOF
-        set(CTEST_SITE "GitHubActions")
-        file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/.." CTEST_DASHBOARD_ROOT)
-        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_NAME} MATCHES "master" OR ENV{GITHUB_REF_NAME} MATCHES "main"))
-          set(branch "-master")
-          set(dashboard_model "Continuous")
-        else()
-          set(branch "-${GITHUB_REF}")
-          set(dashboard_model "Experimental")
-        endif()
-        set(CTEST_BUILD_NAME "${GITHUB_REPOSITORY}-${operating_system}-\${branch}")
-        set(CTEST_UPDATE_VERSION_ONLY 1)
-        set(CTEST_TEST_ARGS \${CTEST_TEST_ARGS} PARALLEL_LEVEL \${PARALLEL_LEVEL})
-        set(CTEST_BUILD_CONFIGURATION "Release")
-        set(CTEST_CMAKE_GENERATOR "Ninja")
-        set(CTEST_CUSTOM_WARNING_EXCEPTION
-          \${CTEST_CUSTOM_WARNING_EXCEPTION}
-          # macOS Azure VM Warning
-          "ld: warning: text-based stub file"
-          )
-        set(dashboard_no_clean 1)
-        set(ENV{CC} ${{ matrix.c-compiler }})
-        set(ENV{CXX} ${{ matrix.cxx-compiler }})
-        if(WIN32)
-          set(ENV{PATH} "\${CTEST_DASHBOARD_ROOT}/ITK-b/bin;\$ENV{PATH}")
-        endif()
-        set(dashboard_cache "
-        ITK_DIR:PATH=\${CTEST_DASHBOARD_ROOT}/ITK-b
-        Module_MorphologicalContourInterpolation_BUILD_EXAMPLES:BOOL=ON
-        BUILD_TESTING:BOOL=ON
-        ")
-        string(TIMESTAMP build_date "%Y-%m-%d")
-        message("CDash Build Identifier: \${build_date} \${CTEST_BUILD_NAME}")
-        message("CTEST_SITE = \${CTEST_SITE}")
-        include(\${CTEST_SCRIPT_DIRECTORY}/itk_common.cmake)
-        EOF
-        cat dashboard.cmake
-
-    - name: Build and test
-      if: matrix.os != 'windows-2022'
-      run: |
-        ctest --output-on-failure -V -S dashboard.cmake
-
-    - name: Build and test
-      if: matrix.os == 'windows-2022'
-      shell: cmd
-      run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
-        ctest --output-on-failure -V -S dashboard.cmake
+  cxx-build-workflow:
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected]
+    with:
+      itk-cmake-options: '-DModule_MorphologicalContourInterpolation_BUILD_EXAMPLES:BOOL=ON'
 
   python-build-workflow:
-    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@b114bdd01a16855f57df0a973e665e61ac83355d
+    uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/[email protected]
+    with:
+      test-notebooks: false
     secrets:
       pypi_password: ${{ secrets.pypi_password }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.16.3)
 
+if(POLICY CMP0135)
+  cmake_policy(SET CMP0135 NEW)
+endif()
+
 if(CMAKE_CXX_STANDARD EQUAL "11" )
    message(FATAL_ERROR "CMAKE_CXX_STANDARD:STRING=11 is not supported in ITK version 5.3 and greater.")
 endif()
@@ -21,7 +25,7 @@ endif()
 project(MorphologicalContourInterpolation)
 
 if(NOT ITK_SOURCE_DIR)
-  find_package(ITK 4.9 REQUIRED)
+  find_package(ITK REQUIRED)
   list(APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR})
   include(ITKModuleExternal)
   if(WASI OR EMSCRIPTEN)

diff --git a/itk-module.cmake b/itk-module.cmake
@@ -3,6 +3,7 @@ of manually segmented anatomical contours.
 Enabling testing requires RLEImage module to be enabled.")
 
 itk_module(MorphologicalContourInterpolation
+  ENABLE_SHARED
   DEPENDS
     ITKBinaryMathematicalMorphology
     ITKDistanceMap

diff --git a/setup.py b/setup.py
@@ -49,6 +49,6 @@
     keywords='ITK InsightToolkit Segmentation Interpolation-methods',
     url=r'https://github.com/KitwareMedical/ITKMorphologicalContourInterpolation',
     install_requires=[
-        r'itk>=5.3.0'
+        r'itk>=5.4rc2'
     ]
     )