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/.editorconfig b/.editorconfig index 234b14f..4bacdd6 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -# http://EditorConfig.org +# https://EditorConfig.org # top-most EditorConfig file root = true diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index edfeeef..da9bfef 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -16,17 +16,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: @@ -139,9 +139,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 @@ -186,7 +186,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 @@ -228,9 +228,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 @@ -264,7 +264,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 cd ITKBoneEnhancement diff --git a/LICENSE b/LICENSE index 261eeb9..20e4bd8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ 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 @@ -192,7 +192,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/include/itkLandmarkAtlasSegmentationFilter.h b/include/itkLandmarkAtlasSegmentationFilter.h index 3a7f219..c66188d 100644 --- a/include/itkLandmarkAtlasSegmentationFilter.h +++ b/include/itkLandmarkAtlasSegmentationFilter.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/itkLandmarkAtlasSegmentationFilter.hxx b/include/itkLandmarkAtlasSegmentationFilter.hxx index daba93e..4974b3c 100644 --- a/include/itkLandmarkAtlasSegmentationFilter.hxx +++ b/include/itkLandmarkAtlasSegmentationFilter.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/itkSegmentBonesInMicroCTFilter.h b/include/itkSegmentBonesInMicroCTFilter.h index 159591d..fb5e6e0 100644 --- a/include/itkSegmentBonesInMicroCTFilter.h +++ b/include/itkSegmentBonesInMicroCTFilter.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/itkSegmentBonesInMicroCTFilter.hxx b/include/itkSegmentBonesInMicroCTFilter.hxx index 96246d3..2d219df 100644 --- a/include/itkSegmentBonesInMicroCTFilter.hxx +++ b/include/itkSegmentBonesInMicroCTFilter.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/src/hasi/LICENSE b/src/hasi/LICENSE index 6b8b53b..21720ed 100644 --- a/src/hasi/LICENSE +++ b/src/hasi/LICENSE @@ -1,6 +1,6 @@ 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 diff --git a/src/hasi/hasi/align.py b/src/hasi/hasi/align.py index 192c4d3..e8720b5 100644 --- a/src/hasi/hasi/align.py +++ b/src/hasi/hasi/align.py @@ -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/src/hasi/hasi/classify.py b/src/hasi/hasi/classify.py index 8e8cba4..2fe6c8f 100644 --- a/src/hasi/hasi/classify.py +++ b/src/hasi/hasi/classify.py @@ -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/src/hasi/hasi/diffeoregistrar.py b/src/hasi/hasi/diffeoregistrar.py index e643db3..cd6836e 100644 --- a/src/hasi/hasi/diffeoregistrar.py +++ b/src/hasi/hasi/diffeoregistrar.py @@ -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/src/hasi/hasi/meansquaresregistrar.py b/src/hasi/hasi/meansquaresregistrar.py index bf46e2c..cb28d44 100644 --- a/src/hasi/hasi/meansquaresregistrar.py +++ b/src/hasi/hasi/meansquaresregistrar.py @@ -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/src/hasi/hasi/meshtomeshregistrar.py b/src/hasi/hasi/meshtomeshregistrar.py index 1ebc842..31b8f08 100644 --- a/src/hasi/hasi/meshtomeshregistrar.py +++ b/src/hasi/hasi/meshtomeshregistrar.py @@ -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/src/hasi/hasi/pointsetentropyregistrar.py b/src/hasi/hasi/pointsetentropyregistrar.py index c4bcf59..495e171 100644 --- a/src/hasi/hasi/pointsetentropyregistrar.py +++ b/src/hasi/hasi/pointsetentropyregistrar.py @@ -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/src/hasi/mouse_femur_tibia_ct_morphometry.py b/src/hasi/mouse_femur_tibia_ct_morphometry.py index 3fe67b7..3ce8a26 100644 --- a/src/hasi/mouse_femur_tibia_ct_morphometry.py +++ b/src/hasi/mouse_femur_tibia_ct_morphometry.py @@ -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/src/hasi/test_align.py b/src/hasi/test_align.py index 2340753..62acf35 100644 --- a/src/hasi/test_align.py +++ b/src/hasi/test_align.py @@ -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/src/hasi/test_integration.py b/src/hasi/test_integration.py index 8908667..52c1a01 100644 --- a/src/hasi/test_integration.py +++ b/src/hasi/test_integration.py @@ -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/src/hasi/test_oai.py b/src/hasi/test_oai.py index a17b975..1cbc077 100644 --- a/src/hasi/test_oai.py +++ b/src/hasi/test_oai.py @@ -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/src/hasi/test_registrars.py b/src/hasi/test_registrars.py index a3e70f9..719872d 100644 --- a/src/hasi/test_registrars.py +++ b/src/hasi/test_registrars.py @@ -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/itkLandmarkAtlasSegmentationFilterTest.cxx b/test/itkLandmarkAtlasSegmentationFilterTest.cxx index 568275e..d83911c 100644 --- a/test/itkLandmarkAtlasSegmentationFilterTest.cxx +++ b/test/itkLandmarkAtlasSegmentationFilterTest.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/itkSegmentBonesInMicroCTFilterTest.cxx b/test/itkSegmentBonesInMicroCTFilterTest.cxx index ad64b73..bcaee87 100644 --- a/test/itkSegmentBonesInMicroCTFilterTest.cxx +++ b/test/itkSegmentBonesInMicroCTFilterTest.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,