From 2f3768110ffe160c00c533a1450a49a16f4452d9 Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Tue, 31 May 2022 11:26:58 -0400 Subject: [PATCH] ENH: Bump ITK and replace http with https using script --- .clang-format | 2 +- .github/workflows/build-test-package.yml | 18 +++++++++--------- LICENSE | 4 ++-- README.rst | 8 ++++---- ...LabelImageGenericInterpolateImageFunction.h | 2 +- ...belImageGenericInterpolateImageFunction.hxx | 2 +- include/itkLabelSelectionImageAdaptor.h | 2 +- include/itkLabelSelectionPixelAccessor.h | 2 +- setup.py | 2 +- test/RotateLabels.cxx | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.clang-format b/.clang-format index 399e250..411b009 100644 --- a/.clang-format +++ b/.clang-format @@ -4,7 +4,7 @@ ## See: https://clang.llvm.org/docs/ClangFormatStyleOptions.html for details of each option ## ## The clang-format binaries can be downloaded as part of the clang binary distributions -## from http://releases.llvm.org/download.html +## from https://releases.llvm.org/download.html ## ## Use the script Utilities/Maintenance/clang-format.bash to faciliate ## maintaining a consistent code style. diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 1cfdf5a..81b2041 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: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" cmake-build-type: "MinSizeRel" - os: windows-2019 c-compiler: "cl.exe" cxx-compiler: "cl.exe" - itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" cmake-build-type: "Release" - os: macos-10.15 c-compiler: "clang" cxx-compiler: "clang++" - itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" cmake-build-type: "MinSizeRel" steps: @@ -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.2rc01" + - itk-python-git-tag: "v5.3rc04" 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.3rc04" 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.3rc04" steps: - name: Get specific version of CMake, Ninja @@ -241,7 +241,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/LICENSE b/LICENSE index d645695..62589ed 100755 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION @@ -193,7 +193,7 @@ you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/README.rst b/README.rst index 94cf5ac..9b8e9b2 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,7 @@ ITKGenericLabelInterpolator Overview -------- -This is a module for the `Insight Toolkit (ITK) `_ that +This is a module for the `Insight Toolkit (ITK) `_ that provides a generic interpolator for label images to interpolate each label with an ordinary image interpolator, and return the label with the highest value. This is the idea used by the @@ -25,13 +25,13 @@ programming, the proposed interpolator extends this idea to any image interpolator. Combined with linear interpolation, this results in similar or better accuracy and much improved computation speeds on a test image. -For more information, see the `Insight Journal article `_:: +For more information, see the `Insight Journal article `_:: Schaerer, J., Roche, F., Belaroussi, B. A generic interpolator for multi-label images The Insight Journal. January-December, 2014. - http://hdl.handle.net/10380/3506 - http://www.insight-journal.org/browse/publication/950 + https://hdl.handle.net/10380/3506 + https://www.insight-journal.org/browse/publication/950 Installation diff --git a/include/itkLabelImageGenericInterpolateImageFunction.h b/include/itkLabelImageGenericInterpolateImageFunction.h index 8431f4e..2c7fa03 100644 --- a/include/itkLabelImageGenericInterpolateImageFunction.h +++ b/include/itkLabelImageGenericInterpolateImageFunction.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkLabelImageGenericInterpolateImageFunction.hxx b/include/itkLabelImageGenericInterpolateImageFunction.hxx index 7924e3f..d12596f 100644 --- a/include/itkLabelImageGenericInterpolateImageFunction.hxx +++ b/include/itkLabelImageGenericInterpolateImageFunction.hxx @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkLabelSelectionImageAdaptor.h b/include/itkLabelSelectionImageAdaptor.h index d58e795..cca6650 100644 --- a/include/itkLabelSelectionImageAdaptor.h +++ b/include/itkLabelSelectionImageAdaptor.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/include/itkLabelSelectionPixelAccessor.h b/include/itkLabelSelectionPixelAccessor.h index 99b1aea..0c2ccf1 100644 --- a/include/itkLabelSelectionPixelAccessor.h +++ b/include/itkLabelSelectionPixelAccessor.h @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/setup.py b/setup.py index e86b6d9..22428cf 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ 'Please refer to:\n' 'Schaerer J., Roche F., Belaroussi B., ' '"A generic interpolator for multi-label images.", ' - 'Insight Journal, January-December 2014, http://hdl.handle.net/10380/3506.', + 'Insight Journal, January-December 2014, https://hdl.handle.net/10380/3506.', classifiers=[ "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", diff --git a/test/RotateLabels.cxx b/test/RotateLabels.cxx index a278748..3aaf2ec 100644 --- a/test/RotateLabels.cxx +++ b/test/RotateLabels.cxx @@ -6,7 +6,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0.txt + * https://www.apache.org/licenses/LICENSE-2.0.txt * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS,