From 36b524df041ea7b803510c421d2af90f3d30b08c Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Tue, 31 May 2022 13:24:34 -0400 Subject: [PATCH] ENH: Bump ITK and change http to https --- .github/workflows/build-test-package.yml | 14 +++++++------- LICENSE | 4 ++-- README.rst | 8 ++++---- examples/PhaseSymmetryFilter.cxx | 2 +- examples/main2.cxx | 2 +- examples/main3.cxx | 2 +- examples/phase-symmetry.py | 2 +- include/itkButterworthFilterFreqImageSource.h | 2 +- include/itkButterworthFilterFreqImageSource.hxx | 2 +- include/itkLogGaborFreqImageSource.h | 2 +- include/itkLogGaborFreqImageSource.hxx | 2 +- include/itkPhaseSymmetryImageFilter.h | 2 +- include/itkPhaseSymmetryImageFilter.hxx | 2 +- include/itkSinusoidImageSource.h | 2 +- include/itkSinusoidImageSource.hxx | 2 +- include/itkSinusoidSpatialFunction.h | 2 +- include/itkSinusoidSpatialFunction.hxx | 2 +- include/itkSteerableFilterFreqImageSource.h | 2 +- include/itkSteerableFilterFreqImageSource.hxx | 2 +- setup.py | 2 +- test/itkButterworthFilterFreqImageSourceTest.cxx | 2 +- test/itkLogGaborFreqImageSourceTest.cxx | 2 +- test/itkPhaseSymmetryImageFilterTest.cxx | 2 +- test/itkSinusoidImageSourceTest.cxx | 2 +- test/itkSteerableFilterFreqImageSourceTest.cxx | 2 +- 25 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index f1da2c5..a7a20cc 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.3rc03" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" cmake-build-type: "MinSizeRel" - os: windows-2019 c-compiler: "cl.exe" cxx-compiler: "cl.exe" - itk-git-tag: "v5.3rc03" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" cmake-build-type: "Release" - os: macos-10.15 c-compiler: "clang" cxx-compiler: "clang++" - itk-git-tag: "v5.3rc03" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" cmake-build-type: "MinSizeRel" steps: @@ -136,7 +136,7 @@ jobs: matrix: python-version: [37, 38, 39, 310] include: - - itk-python-git-tag: "v5.3rc03" + - 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.3rc03" + - itk-python-git-tag: "v5.3rc04" steps: - uses: actions/checkout@v2 @@ -208,7 +208,7 @@ jobs: matrix: python-version-minor: [7, 8, 9, 10] include: - - itk-python-git-tag: "v5.3rc03" + - itk-python-git-tag: "v5.3rc04" steps: - uses: actions/checkout@v2 @@ -238,7 +238,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" diff --git a/LICENSE b/LICENSE index d645695..62589ed 100644 --- 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 bb9812a..fc53285 100644 --- a/README.rst +++ b/README.rst @@ -14,20 +14,20 @@ ITKPhaseSymmetry Overview -------- -This is a module for the `Insight Toolkit (ITK) `_ that +This is a module for the `Insight Toolkit (ITK) `_ that provides multi-scale steerable filters for computing phase symmetry (PS). Multi-scale steerable phase-symmetry filters are applied in the image Fourier transform domain, and have been shown to be a useful pre-processing measure for performing image registration and segmentation. -For more information, see the `Insight Journal article `_:: +For more information, see the `Insight Journal article `_:: Hatt C. Multi-scale Steerable Phase-Symmetry Filters for ITK The Insight Journal. July-December. 2011. - http://hdl.handle.net/10380/3330 - http://www.insight-journal.org/browse/publication/846 + https://hdl.handle.net/10380/3330 + https://www.insight-journal.org/browse/publication/846 Installation diff --git a/examples/PhaseSymmetryFilter.cxx b/examples/PhaseSymmetryFilter.cxx index eeb2359..d2f9691 100644 --- a/examples/PhaseSymmetryFilter.cxx +++ b/examples/PhaseSymmetryFilter.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, diff --git a/examples/main2.cxx b/examples/main2.cxx index 012b951..3ebbb00 100644 --- a/examples/main2.cxx +++ b/examples/main2.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, diff --git a/examples/main3.cxx b/examples/main3.cxx index f8b28f2..cb8e801 100644 --- a/examples/main3.cxx +++ b/examples/main3.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, diff --git a/examples/phase-symmetry.py b/examples/phase-symmetry.py index 8286159..6a0e358 100755 --- a/examples/phase-symmetry.py +++ b/examples/phase-symmetry.py @@ -7,7 +7,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/itkButterworthFilterFreqImageSource.h b/include/itkButterworthFilterFreqImageSource.h index e25609d..65a9594 100644 --- a/include/itkButterworthFilterFreqImageSource.h +++ b/include/itkButterworthFilterFreqImageSource.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/itkButterworthFilterFreqImageSource.hxx b/include/itkButterworthFilterFreqImageSource.hxx index af91679..57a0049 100644 --- a/include/itkButterworthFilterFreqImageSource.hxx +++ b/include/itkButterworthFilterFreqImageSource.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/itkLogGaborFreqImageSource.h b/include/itkLogGaborFreqImageSource.h index 89e0dd3..0952740 100644 --- a/include/itkLogGaborFreqImageSource.h +++ b/include/itkLogGaborFreqImageSource.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/itkLogGaborFreqImageSource.hxx b/include/itkLogGaborFreqImageSource.hxx index 6a6b245..c32098f 100644 --- a/include/itkLogGaborFreqImageSource.hxx +++ b/include/itkLogGaborFreqImageSource.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/itkPhaseSymmetryImageFilter.h b/include/itkPhaseSymmetryImageFilter.h index 6279d41..cd3b8a2 100644 --- a/include/itkPhaseSymmetryImageFilter.h +++ b/include/itkPhaseSymmetryImageFilter.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/itkPhaseSymmetryImageFilter.hxx b/include/itkPhaseSymmetryImageFilter.hxx index f9b5788..418dc12 100644 --- a/include/itkPhaseSymmetryImageFilter.hxx +++ b/include/itkPhaseSymmetryImageFilter.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/itkSinusoidImageSource.h b/include/itkSinusoidImageSource.h index 1f0ddf0..0b43f19 100644 --- a/include/itkSinusoidImageSource.h +++ b/include/itkSinusoidImageSource.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/itkSinusoidImageSource.hxx b/include/itkSinusoidImageSource.hxx index c7dd3e1..1f743bf 100644 --- a/include/itkSinusoidImageSource.hxx +++ b/include/itkSinusoidImageSource.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/itkSinusoidSpatialFunction.h b/include/itkSinusoidSpatialFunction.h index 560f3f6..1cacd73 100644 --- a/include/itkSinusoidSpatialFunction.h +++ b/include/itkSinusoidSpatialFunction.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/itkSinusoidSpatialFunction.hxx b/include/itkSinusoidSpatialFunction.hxx index 28ed3c3..b1e9cca 100644 --- a/include/itkSinusoidSpatialFunction.hxx +++ b/include/itkSinusoidSpatialFunction.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/itkSteerableFilterFreqImageSource.h b/include/itkSteerableFilterFreqImageSource.h index 6803d8d..c60966a 100644 --- a/include/itkSteerableFilterFreqImageSource.h +++ b/include/itkSteerableFilterFreqImageSource.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/itkSteerableFilterFreqImageSource.hxx b/include/itkSteerableFilterFreqImageSource.hxx index 7225333..4f893bb 100644 --- a/include/itkSteerableFilterFreqImageSource.hxx +++ b/include/itkSteerableFilterFreqImageSource.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/setup.py b/setup.py index 2b6e887..4d01dc8 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ 'transform domain.\n' 'Please refer to:\n' 'C. Hatt, "Multi-scale Steerable Phase-Symmetry Filters for ITK.", ' - 'Insight Journal, July-December 2011, http://hdl.handle.net/10380/3330.', + 'Insight Journal, July-December 2011, https://hdl.handle.net/10380/3330.', classifiers=[ "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", diff --git a/test/itkButterworthFilterFreqImageSourceTest.cxx b/test/itkButterworthFilterFreqImageSourceTest.cxx index 3e7a7e9..3b1bba8 100644 --- a/test/itkButterworthFilterFreqImageSourceTest.cxx +++ b/test/itkButterworthFilterFreqImageSourceTest.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, diff --git a/test/itkLogGaborFreqImageSourceTest.cxx b/test/itkLogGaborFreqImageSourceTest.cxx index d640a92..ce7b745 100644 --- a/test/itkLogGaborFreqImageSourceTest.cxx +++ b/test/itkLogGaborFreqImageSourceTest.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, diff --git a/test/itkPhaseSymmetryImageFilterTest.cxx b/test/itkPhaseSymmetryImageFilterTest.cxx index 56e218b..3353d62 100644 --- a/test/itkPhaseSymmetryImageFilterTest.cxx +++ b/test/itkPhaseSymmetryImageFilterTest.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, diff --git a/test/itkSinusoidImageSourceTest.cxx b/test/itkSinusoidImageSourceTest.cxx index 7bd6bbd..e4e8a39 100644 --- a/test/itkSinusoidImageSourceTest.cxx +++ b/test/itkSinusoidImageSourceTest.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, diff --git a/test/itkSteerableFilterFreqImageSourceTest.cxx b/test/itkSteerableFilterFreqImageSourceTest.cxx index 7fc516c..7e6e24c 100644 --- a/test/itkSteerableFilterFreqImageSourceTest.cxx +++ b/test/itkSteerableFilterFreqImageSourceTest.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,