ENH: Bump ITK and replace http with https

InsightSoftwareConsortium · Jun 2, 2022 · 7647736 · 7647736
1 parent 7841c13
commit 7647736
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 35 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
@@ -236,7 +236,7 @@ jobs:
       shell: cmd
       run: |
         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
@@ -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
@@ -17,13 +17,13 @@ Overview
 This repository contains an ITK MeshIO class to read and write ITK meshes into
 STL files.
 
-For more information, see the `Insight Journal article <http://hdl.handle.net/10380/3452>`_::
+For more information, see the `Insight Journal article <https://hdl.handle.net/10380/3452>`_::
 
   Ibáñez L.
   STL file format MeshIO class for ITK
   The Insight Journal. January-December. 2014.
-  http://hdl.handle.net/10380/3452
-  http://www.insight-journal.org/browse/publication/913
+  https://hdl.handle.net/10380/3452
+  https://www.insight-journal.org/browse/publication/913
 
 
 Installation

diff --git a/include/itkSTLMeshIO.h b/include/itkSTLMeshIO.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/itkSTLMeshIOFactory.h b/include/itkSTLMeshIOFactory.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
@@ -24,7 +24,7 @@
                      'meshes into STL files.\n'
                      'Please refer to:\n'
                      'Ibáñez L. "STL file format MeshIO class for ITK", '
-                     'Insight Journal, January-December 2014, http://hdl.handle.net/10380/3452.',
+                     'Insight Journal, January-December 2014, https://hdl.handle.net/10380/3452.',
     classifiers=[
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",

diff --git a/src/itkSTLMeshIO.cxx b/src/itkSTLMeshIO.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,
@@ -180,7 +180,7 @@ STLMeshIO ::ReadMeshInternalFromAscii()
   while (!this->CheckStringFromAscii("endsolid"))
   {
     //
-    // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+    // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
     //
     //  facet normal ni nj nk
     //      outer loop
@@ -257,7 +257,7 @@ void
 STLMeshIO ::ReadMeshInternalFromBinary()
 {
   //
-  // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+  // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
   //
   // UINT8[80] header
   //
@@ -277,7 +277,7 @@ STLMeshIO ::ReadMeshInternalFromBinary()
 
   //
   // Binary values in STL files are expected to be in little endian
-  // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+  // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
   //
   ByteSwapper<int32_t>::SwapFromSystemToLittleEndian(&numberOfTriangles);
 
@@ -420,7 +420,7 @@ STLMeshIO ::WriteMeshInformation()
   else if (this->GetFileType() == IOFileEnum::BINARY)
   {
     //
-    // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+    // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
     //
     // UINT8[80] header
     //
@@ -556,7 +556,7 @@ STLMeshIO ::WriteCellsAsBinary(void * buffer)
   NormalType normal;
 
   //
-  // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+  // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
   //
   // UINT32 -- Number of Triangles
   //
@@ -601,7 +601,7 @@ STLMeshIO ::WriteCellsAsBinary(void * buffer)
     CrossProduct(normal, v12, v10);
 
     //
-    // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+    // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
     //
     //    foreach triangle
     //    REAL32[3] – Normal vector
@@ -677,7 +677,7 @@ STLMeshIO ::WriteInt32AsBinary(int32_t value)
 {
   //
   // Binary values in STL files are expected to be in little endian
-  // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+  // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
   //
   ByteSwapper<int32_t>::SwapFromSystemToLittleEndian(&value);
   this->m_OutputStream.write(reinterpret_cast<const char *>(&value), sizeof(value));
@@ -689,7 +689,7 @@ STLMeshIO ::WriteInt16AsBinary(int16_t value)
 {
   //
   // Binary values in STL files are expected to be in little endian
-  // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+  // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
   //
   ByteSwapper<int16_t>::SwapFromSystemToLittleEndian(&value);
   this->m_OutputStream.write(reinterpret_cast<const char *>(&value), sizeof(value));
@@ -704,7 +704,7 @@ STLMeshIO ::WriteNormalAsBinary(const NormalType & normal)
     float value = normal[i];
     //
     // Binary values in STL files are expected to be in little endian
-    // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+    // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
     //
     ByteSwapper<float>::SwapFromSystemToLittleEndian(&value);
     this->m_OutputStream.write(reinterpret_cast<const char *>(&value), sizeof(value));
@@ -720,7 +720,7 @@ STLMeshIO ::WritePointAsBinary(const PointType & point)
     float value = point[i];
     //
     // Binary values in STL files are expected to be in little endian
-    // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+    // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
     //
     ByteSwapper<float>::SwapFromSystemToLittleEndian(&value);
     this->m_OutputStream.write(reinterpret_cast<const char *>(&value), sizeof(value));
@@ -737,7 +737,7 @@ STLMeshIO ::ReadNormalAsBinary(NormalType & normal)
     this->m_InputStream.read(reinterpret_cast<char *>(&value), sizeof(value));
     //
     // Binary values in STL files are expected to be in little endian
-    // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+    // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
     //
     ByteSwapper<float>::SwapFromSystemToLittleEndian(&value);
     normal[i] = value;
@@ -751,7 +751,7 @@ STLMeshIO ::ReadInt32AsBinary(int32_t & value)
   this->m_InputStream.read(reinterpret_cast<char *>(&value), sizeof(value));
   //
   // Binary values in STL files are expected to be in little endian
-  // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+  // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
   //
   ByteSwapper<int32_t>::SwapFromSystemToLittleEndian(&value);
 }
@@ -763,7 +763,7 @@ STLMeshIO ::ReadInt16AsBinary(int16_t & value)
   this->m_InputStream.read(reinterpret_cast<char *>(&value), sizeof(value));
   //
   // Binary values in STL files are expected to be in little endian
-  // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+  // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
   //
   ByteSwapper<int16_t>::SwapFromSystemToLittleEndian(&value);
 }
@@ -778,7 +778,7 @@ STLMeshIO ::ReadPointAsBinary(PointType & point)
     this->m_InputStream.read(reinterpret_cast<char *>(&value), sizeof(value));
     //
     // Binary values in STL files are expected to be in little endian
-    // http://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
+    // https://en.wikipedia.org/wiki/STL_(file_format)#Binary_STL
     //
     ByteSwapper<float>::SwapFromSystemToLittleEndian(&value);
     point[i] = value;

diff --git a/src/itkSTLMeshIOFactory.cxx b/src/itkSTLMeshIOFactory.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/itkSTLMeshIOTest.cxx b/test/itkSTLMeshIOTest.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,