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 e4aaf71..09727af 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.2.0.post2" + - 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.2.0.post2" + - 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.2.0.post2" + - 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 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 0a745ad..fe29dff 100644 --- a/README.rst +++ b/README.rst @@ -7,17 +7,17 @@ ITKMinimalPathExtraction Overview -------- -This is an `ITK `_ module that implements a minimal path +This is an `ITK `_ module that implements a minimal path extraction framework based on Fast Marching arrival functions. A more detailed description can be found in -`the Insight Journal article `_:: +`the Insight Journal article `_:: Mueller, D. "Fast Marching Minimal Path Extraction in ITK" The Insight Journal. January-June, 2008. - http://hdl.handle.net/1926/1332 - http://www.insight-journal.org/browse/publication/213 + https://hdl.handle.net/1926/1332 + https://www.insight-journal.org/browse/publication/213 Installation diff --git a/include/itkArrivalFunctionToPathFilter.h b/include/itkArrivalFunctionToPathFilter.h index c2131b2..edd01e4 100644 --- a/include/itkArrivalFunctionToPathFilter.h +++ b/include/itkArrivalFunctionToPathFilter.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/itkArrivalFunctionToPathFilter.hxx b/include/itkArrivalFunctionToPathFilter.hxx index 0b5e485..ea18d1d 100644 --- a/include/itkArrivalFunctionToPathFilter.hxx +++ b/include/itkArrivalFunctionToPathFilter.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/itkIterateNeighborhoodOptimizer.h b/include/itkIterateNeighborhoodOptimizer.h index dd11be1..5e28ac2 100644 --- a/include/itkIterateNeighborhoodOptimizer.h +++ b/include/itkIterateNeighborhoodOptimizer.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/itkPhysicalCentralDifferenceImageFunction.h b/include/itkPhysicalCentralDifferenceImageFunction.h index 4bc2869..da30aa6 100644 --- a/include/itkPhysicalCentralDifferenceImageFunction.h +++ b/include/itkPhysicalCentralDifferenceImageFunction.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/itkPhysicalCentralDifferenceImageFunction.hxx b/include/itkPhysicalCentralDifferenceImageFunction.hxx index 931b6e7..6a6f6ff 100644 --- a/include/itkPhysicalCentralDifferenceImageFunction.hxx +++ b/include/itkPhysicalCentralDifferenceImageFunction.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/itkSingleImageCostFunction.h b/include/itkSingleImageCostFunction.h index fd644d3..bcefdf9 100644 --- a/include/itkSingleImageCostFunction.h +++ b/include/itkSingleImageCostFunction.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/itkSingleImageCostFunction.hxx b/include/itkSingleImageCostFunction.hxx index 0313a49..8ddc69d 100644 --- a/include/itkSingleImageCostFunction.hxx +++ b/include/itkSingleImageCostFunction.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/itkSpeedFunctionPathInformation.h b/include/itkSpeedFunctionPathInformation.h index d2a231f..00be1e6 100644 --- a/include/itkSpeedFunctionPathInformation.h +++ b/include/itkSpeedFunctionPathInformation.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/itkSpeedFunctionPathInformation.hxx b/include/itkSpeedFunctionPathInformation.hxx index a049abb..2bb423e 100644 --- a/include/itkSpeedFunctionPathInformation.hxx +++ b/include/itkSpeedFunctionPathInformation.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/itkSpeedFunctionToPathFilter.h b/include/itkSpeedFunctionToPathFilter.h index bb75b0d..23db644 100644 --- a/include/itkSpeedFunctionToPathFilter.h +++ b/include/itkSpeedFunctionToPathFilter.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/itkSpeedFunctionToPathFilter.hxx b/include/itkSpeedFunctionToPathFilter.hxx index bace752..16edadf 100644 --- a/include/itkSpeedFunctionToPathFilter.hxx +++ b/include/itkSpeedFunctionToPathFilter.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 c7a418c..4da6337 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ 'functions.\n' 'Please refer to:\n' 'Mueller, D. "Fast Marching Minimal Path Extraction in ITK", ' - 'Insight Journal, January-June 2008, http://hdl.handle.net/1926/1332.', + 'Insight Journal, January-June 2008, https://hdl.handle.net/1926/1332.', classifiers=[ "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", diff --git a/src/itkIterateNeighborhoodOptimizer.cxx b/src/itkIterateNeighborhoodOptimizer.cxx index f7cde46..d7a7fb4 100644 --- a/src/itkIterateNeighborhoodOptimizer.cxx +++ b/src/itkIterateNeighborhoodOptimizer.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/MinimalPathTest.h b/test/MinimalPathTest.h index 9c27447..c2c6485 100644 --- a/test/MinimalPathTest.h +++ b/test/MinimalPathTest.h @@ -8,8 +8,8 @@ Version: 2.0 Portions of this code are covered under the ITK and VTK copyright. - See VTKCopyright.txt or http://www.kitware.com/VTKCopyright.htm for details. - See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details. + See VTKCopyright.txt or https://www.kitware.com/VTKCopyright.htm for details. + See ITKCopyright.txt or https://www.itk.org/HTML/Copyright.htm for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR diff --git a/test/Test_SpeedToPath_GradientDescent_2D.cxx b/test/Test_SpeedToPath_GradientDescent_2D.cxx index 48635a7..0b46dca 100644 --- a/test/Test_SpeedToPath_GradientDescent_2D.cxx +++ b/test/Test_SpeedToPath_GradientDescent_2D.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/Test_SpeedToPath_GradientDescent_3D.cxx b/test/Test_SpeedToPath_GradientDescent_3D.cxx index 9e22ed4..02b6f9b 100644 --- a/test/Test_SpeedToPath_GradientDescent_3D.cxx +++ b/test/Test_SpeedToPath_GradientDescent_3D.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/Test_SpeedToPath_IterateNeighborhood_2D.cxx b/test/Test_SpeedToPath_IterateNeighborhood_2D.cxx index bb54f95..f64c4b7 100644 --- a/test/Test_SpeedToPath_IterateNeighborhood_2D.cxx +++ b/test/Test_SpeedToPath_IterateNeighborhood_2D.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/Test_SpeedToPath_IterateNeighborhood_3D.cxx b/test/Test_SpeedToPath_IterateNeighborhood_3D.cxx index 35a78e8..a5e8210 100644 --- a/test/Test_SpeedToPath_IterateNeighborhood_3D.cxx +++ b/test/Test_SpeedToPath_IterateNeighborhood_3D.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/Test_SpeedToPath_IterateNeighborhood_ExtendedSeed_2D.cxx b/test/Test_SpeedToPath_IterateNeighborhood_ExtendedSeed_2D.cxx index d78ef96..bc03804 100644 --- a/test/Test_SpeedToPath_IterateNeighborhood_ExtendedSeed_2D.cxx +++ b/test/Test_SpeedToPath_IterateNeighborhood_ExtendedSeed_2D.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/Test_SpeedToPath_RegularStepGradientDescent_2D.cxx b/test/Test_SpeedToPath_RegularStepGradientDescent_2D.cxx index 0c3849c..015d1ac 100644 --- a/test/Test_SpeedToPath_RegularStepGradientDescent_2D.cxx +++ b/test/Test_SpeedToPath_RegularStepGradientDescent_2D.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/Test_SpeedToPath_RegularStepGradientDescent_3D.cxx b/test/Test_SpeedToPath_RegularStepGradientDescent_3D.cxx index 36b3d15..64d3584 100644 --- a/test/Test_SpeedToPath_RegularStepGradientDescent_3D.cxx +++ b/test/Test_SpeedToPath_RegularStepGradientDescent_3D.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,