From a75c889d2873c076315479e574ca98d262ac7727 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 24 Jan 2022 09:07:26 -0500 Subject: [PATCH 1/2] DOC: Update repository name to ISC repo naming convention --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ae93a2a..a1e6951 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -itkMGHImageIO +ITKMGHImageIO ============= -![Build, test, package status](https://github.com/InsightSoftwareConsortium/itkMGHImageIO/workflows/Build,%20test,%20package/badge.svg) +![Build, test, package status](https://github.com/InsightSoftwareConsortium/ITKMGHImageIO/workflows/Build,%20test,%20package/badge.svg) [![PyPI Version](https://img.shields.io/pypi/v/itk-iomgh.svg)](https://pypi.python.org/pypi/itk-iomgh) ITK remote module for IO of images stored in `mgh`, `mgz` and `mgh.gz` formats. @@ -17,7 +17,7 @@ Dominique Belhachemi, Jean-Christophe Fillion-Robin, Julien Finet, Matt McCormic and Andras Lasso. In May 2013, Hans Johnson created the repository `Slicer/itkMGHImageIO` enabling ITK -based programs to support reading and writing MGH files. See [Slicer/itkMGHImageIO@4fa1fd815](https://github.com/InsightSoftwareConsortium/itkMGHImageIO/commit/4fa1fd8155a697bdd1a2c73f475178220d9fb09f). Between 2013 and 2021, this +based programs to support reading and writing MGH files. See [Slicer/itkMGHImageIO@4fa1fd815](https://github.com/InsightSoftwareConsortium/ITKMGHImageIO/commit/4fa1fd8155a697bdd1a2c73f475178220d9fb09f). Between 2013 and 2021, this more general implementation has been developed with contributions from Hans Johnson, Mathew Seng, Xiaoxiao Liu, Matt McCormick, Jon Haitz Legarreta, François Budin, Zach Williamson and Jean-Christophe Fillion-Robin. In September 2015, starting with Slicer commit [Slicer/Slicer@184e907df](https://github.com/Slicer/Slicer/commit/184e907df), Slicer was updated to use the IO provided by `Slicer/itkMGHImageIO` through the ITK remote module mechanism. From 2309a7307a2c3fd6872cac65be9e7e7853a89eaa Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Mon, 24 Jan 2022 09:10:01 -0500 Subject: [PATCH 2/2] ENH: Update CI for itk-5.3rc03 --- .github/workflows/build-test-package.yml | 36 ++++++++++++------------ setup.py | 4 +-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 1cfdf5a..cc9e44b 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -8,31 +8,31 @@ 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.7 - uses: actions/setup-python@v1 + - name: Set up Python 3.8 + uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install build dependencies run: | @@ -83,8 +83,8 @@ 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") - set(branch "-master") + if(ENV{GITHUB_REF} MATCHES "main") + set(branch "-main") set(dashboard_model "Continuous") else() set(branch "-${GITHUB_REF}") @@ -130,13 +130,13 @@ jobs: shell: cmd build-linux-python-packages: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: max-parallel: 2 matrix: - python-version: [36, 37, 38, 39] + python-version: [37, 38, 39, 310] include: - - itk-python-git-tag: "v5.2rc01" + - 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.2rc01" + - 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.2rc01" + - itk-python-git-tag: "v5.3rc03" steps: - name: Get specific version of CMake, Ninja @@ -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 5a7777e..1a47ac5 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ setup( name='itk-iomgh', - version='1.1.0', + version='1.1.1', author='Insight Software Consortium', author_email='community@itk.org', packages=['itk'], @@ -47,6 +47,6 @@ keywords='ITK InsightToolkit MGH Slicer', url=r'https://itk.org/', install_requires=[ - r'itk>=5.2rc1' + r'itk>=5.3rc3' ] )