ENH: Bump ITK and change http to https

InsightSoftwareConsortium · Jun 2, 2022 · 6e30c49 · 6e30c49
1 parent cb71f21
commit 6e30c49
Show file tree

Hide file tree

Showing 40 changed files with 52 additions and 52 deletions.
diff --git 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
@@ -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
@@ -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 @@ Apache License
    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
@@ -17,13 +17,13 @@ Overview
 
 Classes for triangle mesh subdivision.
 
-For more information, see the `Insight Journal article <http://hdl.handle.net/10380/3307>`_::
+For more information, see the `Insight Journal article <https://hdl.handle.net/10380/3307>`_::
 
   Zhu W.
   Triangle Mesh Subdivision
   The Insight Journal. July-December. 2011.
-  http://hdl.handle.net/10380/3307
-  http://www.insight-journal.org/browse/publication/831
+  https://hdl.handle.net/10380/3307
+  https://www.insight-journal.org/browse/publication/831
 
 Installation
 ------------

diff --git a/include/itkCellAreaTriangleCellSubdivisionCriterion.h b/include/itkCellAreaTriangleCellSubdivisionCriterion.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/itkCellAreaTriangleCellSubdivisionCriterion.hxx b/include/itkCellAreaTriangleCellSubdivisionCriterion.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/itkConditionalSubdivisionQuadEdgeMeshFilter.h b/include/itkConditionalSubdivisionQuadEdgeMeshFilter.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/itkConditionalSubdivisionQuadEdgeMeshFilter.hxx b/include/itkConditionalSubdivisionQuadEdgeMeshFilter.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/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.h b/include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.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/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.hxx b/include/itkEdgeLengthTriangleEdgeCellSubdivisionCriterion.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/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.hxx.orig b/include/itkIterativeTriangleCellSubdivisionQuadEdgeMeshFilter.hxx.orig
@@ -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/itkLinearTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLinearTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkLinearTriangleCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkLinearTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.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/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkLinearTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.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/itkLoopTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLoopTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkLoopTriangleCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkLoopTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.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/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkLoopTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.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/itkModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkModifiedButterflyTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.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/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkModifiedButterflyTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.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/itkQuadEdgeMeshSubdivisionCriterion.h b/include/itkQuadEdgeMeshSubdivisionCriterion.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/itkSquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkSquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkSquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkSquareThreeTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkSubdivisionQuadEdgeMeshFilter.h b/include/itkSubdivisionQuadEdgeMeshFilter.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,
@@ -32,7 +32,7 @@ namespace itk
  * Code imported from Insight Journal publication:
  *
  * Wanlin Zhu, Triangle Mesh Subdivision
- * http://hdl.handle.net/10380/3307
+ * https://hdl.handle.net/10380/3307
  *
  * \ingroup SubdivisionQuadEdgeMeshFilter
  */

diff --git a/include/itkSubdivisionQuadEdgeMeshFilter.hxx b/include/itkSubdivisionQuadEdgeMeshFilter.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/itkTriangleCellSubdivisionQuadEdgeMeshFilter.h b/include/itkTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkTriangleCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkTriangleCellSubdivisionQuadEdgeMeshFilter.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/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.h b/include/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.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/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.hxx b/include/itkTriangleEdgeCellSubdivisionQuadEdgeMeshFilter.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
@@ -24,7 +24,7 @@
                      'triangle mesh subdivision.\n'
                      'Please refer to:\n'
                      'W. Zhu, "Triangle Mesh Subdivision.", '
-                     'Insight Journal, July-December 2011, http://hdl.handle.net/10380/3307.',
+                     'Insight Journal, July-December 2011, https://hdl.handle.net/10380/3307.',
     classifiers=[
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",