Skip to content

Commit 2f8d8bf

Browse files
tbirdsodzenanz
tbirdso
authored and
dzenanz
committed
ENH: Bump ITK and replace http with https using script
1 parent d487781 commit 2f8d8bf

File tree

12 files changed

+33
-33
lines changed

12 files changed

+33
-33
lines changed

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## See: https://clang.llvm.org/docs/ClangFormatStyleOptions.html for details of each option
55
##
66
## The clang-format binaries can be downloaded as part of the clang binary distributions
7-
## from http://releases.llvm.org/download.html
7+
## from https://releases.llvm.org/download.html
88
##
99
## Use the script Utilities/Maintenance/clang-format.bash to faciliate
1010
## maintaining a consistent code style.

‎.github/workflows/build-test-package.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
- os: ubuntu-18.04
1414
c-compiler: "gcc"
1515
cxx-compiler: "g++"
16-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
16+
itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
1717
cmake-build-type: "MinSizeRel"
1818
- os: windows-2019
1919
c-compiler: "cl.exe"
2020
cxx-compiler: "cl.exe"
21-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
21+
itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
2222
cmake-build-type: "Release"
2323
- os: macos-10.15
2424
c-compiler: "clang"
2525
cxx-compiler: "clang++"
26-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
26+
itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6"
2727
cmake-build-type: "MinSizeRel"
2828

2929
steps:
@@ -134,9 +134,9 @@ jobs:
134134
strategy:
135135
max-parallel: 2
136136
matrix:
137-
python-version: [36, 37, 38, 39]
137+
python-version: [37, 38, 39, 310]
138138
include:
139-
- itk-python-git-tag: "v5.2rc01"
139+
- itk-python-git-tag: "v5.3rc04"
140140

141141
steps:
142142
- uses: actions/checkout@v2
@@ -172,7 +172,7 @@ jobs:
172172
max-parallel: 2
173173
matrix:
174174
include:
175-
- itk-python-git-tag: "v5.2rc01"
175+
- itk-python-git-tag: "v5.3rc04"
176176

177177
steps:
178178
- uses: actions/checkout@v2
@@ -206,9 +206,9 @@ jobs:
206206
strategy:
207207
max-parallel: 2
208208
matrix:
209-
python-version-minor: [6, 7, 8, 9]
209+
python-version-minor: [7, 8, 9, 10]
210210
include:
211-
- itk-python-git-tag: "v5.2rc01"
211+
- itk-python-git-tag: "v5.3rc04"
212212

213213
steps:
214214
- name: Get specific version of CMake, Ninja
@@ -241,7 +241,7 @@ jobs:
241241
run: |
242242
cd ../../im
243243
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
244-
set PATH="C:\P\grep;%PATH%"
244+
set PATH=C:\P\grep;%PATH%
245245
set CC=cl.exe
246246
set CXX=cl.exe
247247
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"

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Apache License
33
Version 2.0, January 2004
4-
http://www.apache.org/licenses/
4+
https://www.apache.org/licenses/
55

66
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
77

@@ -193,7 +193,7 @@
193193
you may not use this file except in compliance with the License.
194194
You may obtain a copy of the License at
195195

196-
http://www.apache.org/licenses/LICENSE-2.0
196+
https://www.apache.org/licenses/LICENSE-2.0
197197

198198
Unless required by applicable law or agreed to in writing, software
199199
distributed under the License is distributed on an "AS IS" BASIS,

‎README.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ ITKPrincipalComponentsAnalysis
66
Overview
77
--------
88

9-
An `ITK <http://itk.org>`_-based implementation of principal components analysis.
9+
An `ITK <https://itk.org>`_-based implementation of principal components analysis.
1010

11-
For more information, see the `Insight Journal article <http://hdl.handle.net/10380/3386>`_::
11+
For more information, see the `Insight Journal article <https://hdl.handle.net/10380/3386>`_::
1212

1313
Bowers M., Younes L.
1414
Principal Components Analysis of Scalar, Vector, and Mesh Vertex Data
1515
The Insight Journal. August. 2013.
16-
http://hdl.handle.net/10380/3386
17-
http://www.insight-journal.org/browse/publication/878
16+
https://hdl.handle.net/10380/3386
17+
https://www.insight-journal.org/browse/publication/878
1818

1919
Installation
2020
------------

‎doc/Report001/InsightArticle.cls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@
7676

7777
% Define command to make reference to on-line Doxygen documentation
7878
\newcommand{\doxygen}[1]{
79-
\href{http://www.itk.org/Doxygen/html/classitk_1_1#1.html}{\code{itk::#1}}}
79+
\href{https://www.itk.org/Doxygen/html/classitk_1_1#1.html}{\code{itk::#1}}}
8080

8181
% Define command to make reference to on-line Doxygen documentation
8282
\newcommand{\subdoxygen}[2]{
83-
\href{http://www.itk.org/Doxygen/html/classitk_1_1#1_1_1#2.html}{\code{itk::#1::#2}}}
83+
\href{https://www.itk.org/Doxygen/html/classitk_1_1#1_1_1#2.html}{\code{itk::#1::#2}}}
8484

8585
% Define command for the standard comment introducing classes with similar functionalities
8686
\newcommand{\relatedClasses}{

‎doc/Report001/InsightJournal.bib‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ @Manual{ITKSoftwareGuide
3131
Title = {The {ITK} {S}oftware {G}uide},
3232
Author = {Ibanez, L. and Schroeder, W. and Ng, L. and Cates, J.},
3333
Organization = "Kitware, Inc. ISBN 1-930934-10-6",
34-
Address = {http://www.itk.org/ItkSoftwareGuide.pdf},
35-
url = {http://www.itk.org/ItkSoftwareGuide.pdf},
34+
Address = {https://www.itk.org/ItkSoftwareGuide.pdf},
35+
url = {https://www.itk.org/ItkSoftwareGuide.pdf},
3636
Publisher = {Kitware Inc.},
3737
Edition = {First},
3838
year = 2003,
@@ -42,8 +42,8 @@ @Manual{ITKSoftwareGuideSecondEdition
4242
Title = {The {ITK} {S}oftware {G}uide},
4343
Author = {Ibanez, L. and Schroeder, W. and Ng, L. and Cates, J.},
4444
Organization = "Kitware, Inc. ISBN 1-930934-15-7",
45-
Address = {http://www.itk.org/ItkSoftwareGuide.pdf},
46-
url = {http://www.itk.org/ItkSoftwareGuide.pdf},
45+
Address = {https://www.itk.org/ItkSoftwareGuide.pdf},
46+
url = {https://www.itk.org/ItkSoftwareGuide.pdf},
4747
Publisher = {Kitware Inc.},
4848
Edition = {Second},
4949
year = 2005,
@@ -54,8 +54,8 @@ @Article{Gouaillard2007
5454
Title = "ItkQuadEdgeMesh: A Discrete Orientable 2-Manifold Data Structure for Image Processing",
5555
Journal = "Insight Journal",
5656
year = 2007,
57-
url = {http://hdl.handle.net/1926/306},
58-
Address = {http://hdl.handle.net/1926/306}
57+
url = {https://hdl.handle.net/1926/306},
58+
Address = {https://hdl.handle.net/1926/306}
5959
}
6060

6161
@InProceedings{Yeo2008,

‎doc/Report001/InsightJournal.sty‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,11 +1109,11 @@
11091109
% Commands for adding the link reference to the URL in the Insight Journal
11101110
%
11111111
\newcommand{\urlhandle}[1]{
1112-
\url{http://hdl.handle.net/10380/#1}}
1112+
\url{https://hdl.handle.net/10380/#1}}
11131113

11141114
\newcommand{\IJhandle}[1]{
1115-
Latest version available at the \href{http://www.insight-journal.org}{Insight Journal} [\urlhandle{#1}]\\
1116-
Distributed under \href{http://creativecommons.org/licenses/by/3.0/us/}{Creative Commons Attribution License}}
1115+
Latest version available at the \href{https://www.insight-journal.org}{Insight Journal} [\urlhandle{#1}]\\
1116+
Distributed under \href{https://creativecommons.org/licenses/by/3.0/us/}{Creative Commons Attribution License}}
11171117

11181118
\newcommand{\IJhandlefooter}[1]{
11191119
\fancyfoot[CO,CE]{

‎examples/VectorKernelPCA.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,

‎include/itkVectorFieldPCA.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -45,7 +45,7 @@ namespace itk
4545
* This code was contributed in the Insight Journal paper:
4646
*
4747
* "Principal Components Analysis of Scalar, Vector, and Mesh Vertex Data"
48-
* http://www.insight-journal.org/browse/publication/878
48+
* https://www.insight-journal.org/browse/publication/878
4949
*
5050
* \ingroup ITKStatistics
5151
* \ingroup PrincipalComponentsAnalysis

‎include/itkVectorFieldPCA.hxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* you may not use this file except in compliance with the License.
77
* You may obtain a copy of the License at
88
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
9+
* https://www.apache.org/licenses/LICENSE-2.0.txt
1010
*
1111
* Unless required by applicable law or agreed to in writing, software
1212
* distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)