From 5cc217689183465c71b6c087bfdc2ca0305e706d Mon Sep 17 00:00:00 2001 From: Mathew Seng Date: Wed, 21 Oct 2020 10:05:53 -0500 Subject: [PATCH 1/5] ENH: Bump ITK version to 5.1.1 and ITK python version to 5.1.1.post1 This will bump the ITK version in the GitHub Actions build and setup.py. In addition, the package version has been updated from 0.2.0 to 0.2.1 in setup.py --- .github/workflows/build-test-package.yml | 12 ++++++------ setup.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 1e80b9a..c87ef10 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -13,17 +13,17 @@ jobs: - os: ubuntu-18.04 c-compiler: "gcc" cxx-compiler: "g++" - itk-git-tag: "v5.1.0" + itk-git-tag: "v5.1.1" cmake-build-type: "MinSizeRel" - os: windows-2019 c-compiler: "cl.exe" cxx-compiler: "cl.exe" - itk-git-tag: "v5.1.0" + itk-git-tag: "v5.1.1" cmake-build-type: "Release" - os: macos-10.15 c-compiler: "clang" cxx-compiler: "clang++" - itk-git-tag: "v5.1.0" + itk-git-tag: "v5.1.1" cmake-build-type: "MinSizeRel" steps: @@ -130,7 +130,7 @@ jobs: matrix: python-version: [35, 36, 37, 38] include: - - itk-python-git-tag: "v5.1.0.post2" + - itk-python-git-tag: "v5.1.1.post1" steps: - uses: actions/checkout@v2 @@ -166,7 +166,7 @@ jobs: max-parallel: 2 matrix: include: - - itk-python-git-tag: "v5.1.0.post2" + - itk-python-git-tag: "v5.1.1.post1" steps: - uses: actions/checkout@v2 @@ -195,7 +195,7 @@ jobs: matrix: python-version-minor: [5, 6, 7, 8] include: - - itk-python-git-tag: "v5.1.0.post2" + - itk-python-git-tag: "v5.1.1.post1" steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index 25bda67..e68e87f 100644 --- a/setup.py +++ b/setup.py @@ -46,6 +46,6 @@ keywords='ITK InsightToolkit Image-Gradient B-spline', url=r'https://github.com/InsightSoftwareConsortium/ITKBSplineGradient', install_requires=[ - r'itk>=5.1.0.post2' + r'itk>=5.1.1' ] ) From b493bd83568421ae67eabfa320ca8b1bd3fa6141 Mon Sep 17 00:00:00 2001 From: Mathew Seng Date: Fri, 23 Oct 2020 12:50:04 -0500 Subject: [PATCH 2/5] BUG: ITK runtime directory in PATH for Windows not specified --- .github/workflows/build-test-package.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index c87ef10..0fff4f7 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -100,6 +100,9 @@ jobs: 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-build/bin;\$ENV{PATH}") + endif() set(dashboard_cache " ITK_DIR:PATH=\${CTEST_DASHBOARD_ROOT}/ITK-build BUILD_TESTING:BOOL=ON From eff9bf75d6a3be5dc4e6f9c30ee55c16e327ab7e Mon Sep 17 00:00:00 2001 From: Mathew Seng Date: Fri, 23 Oct 2020 13:00:54 -0500 Subject: [PATCH 3/5] ENH: Update supported Python versions for package builds The minimum version has been bumped from 3.5 to 3.6. The maximum has been bumped from 3.8 to 3.9. --- .github/workflows/build-test-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 0fff4f7..d40e337 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -131,7 +131,7 @@ jobs: strategy: max-parallel: 2 matrix: - python-version: [35, 36, 37, 38] + python-version: [36, 37, 38, 39] include: - itk-python-git-tag: "v5.1.1.post1" @@ -196,7 +196,7 @@ jobs: strategy: max-parallel: 2 matrix: - python-version-minor: [5, 6, 7, 8] + python-version-minor: [6, 7, 8, 9] include: - itk-python-git-tag: "v5.1.1.post1" From 1b12a233cf0e15425b63613239993ce67ff20f86 Mon Sep 17 00:00:00 2001 From: Mathew Seng Date: Mon, 16 Nov 2020 11:34:25 -0600 Subject: [PATCH 4/5] BUG: Incorrect CI referenced in README.rst This references azurepipelines when it should GitHub Actions --- README.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.rst b/README.rst index d00c20a..da62b75 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,7 @@ ITKBSplineGradient ================== -.. image:: https://dev.azure.com/ITKBSplineGradient/ITKBSplineGradient/_apis/build/status/InsightSoftwareConsortium.ITKBSplineGradient?branchName=master - :target: https://dev.azure.com/ITKBSplineGradient/ITKBSplineGradient/_build/latest?definitionId=1&branchName=master - :alt: Build status +.. image:: https://github.com/InsightSoftwareConsortium/ITKBSplineGradient/workflows/Build,%20test,%20package/badge.svg Overview -------- From 3298978e6d99e29a17bd785f950a4ac4c5eaf698 Mon Sep 17 00:00:00 2001 From: Mathew Seng Date: Wed, 18 Nov 2020 15:47:03 -0600 Subject: [PATCH 5/5] ENH: Update package version from 0.2.1 to 0.2.2 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e68e87f..e49145a 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup( name='itk-bsplinegradient', - version='0.2.1', + version='0.2.2', author='Matthew McCormick', author_email='matt.mccormick@kitware.com', packages=['itk'],