Skip to content

Commit

Permalink
ENH: Bump ITK and replace http with https using script
Browse files Browse the repository at this point in the history
  • Loading branch information
tbirdso authored and dzenanz committed Jun 1, 2022
1 parent 18d15de commit 2c6aa18
Show file tree
Hide file tree
Showing 47 changed files with 83 additions and 83 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ ITK classes for mathematical morphology using parabolic structuring functions.
Parabolic functions can be used to build fast distance transforms, and binary
morphology using spheres.

For more information, see the `Insight Journal article <http://hdl.handle.net/1926/1370>`_::
For more information, see the `Insight Journal article <https://hdl.handle.net/1926/1370>`_::

Beare R.
Morphology with parabolic structuring elements
The Insight Journal. January-June. 2008.
http://hdl.handle.net/1926/1370
http://www.insight-journal.org/browse/publication/228
https://hdl.handle.net/1926/1370
https://www.insight-journal.org/browse/publication/228

Installation
------------
Expand Down
2 changes: 1 addition & 1 deletion doc/Article.tex
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
% of the standard documentation for Insight. It may be found online
% at:
%
% http://www.itk.org/
% https://www.itk.org/

\documentclass{InsightArticle}

Expand Down
4 changes: 2 additions & 2 deletions doc/InsightArticle.cls
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@

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

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

% Define command for the standard comment introducing classes with similar functionalities
\newcommand{\relatedClasses}{
Expand Down
16 changes: 8 additions & 8 deletions doc/InsightJournal.bib
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ @InProceedings{Whitaker1994c

@Manual{POVRay,
Title = "Persistence of Vision, Ray-Tracer",
Address = "http://www.povray.org",
Address = "https://www.povray.org",
}

@Book{Romeny1994,
Expand All @@ -55,7 +55,7 @@ @Book{ToErrIsHuman2001
@TechReport{Aisemberg,
Author = "G.O. Aisemberg",
Title = "Vertebrate embryology",
Address = "http://lcw.lehman.edu/lehman/depts/biology/aisemberg/Bio268.html",
Address = "https://lcw.lehman.edu/lehman/depts/biology/aisemberg/Bio268.html",
Institution = "Department of Biological Sciences. Lehman College,
City University of New York",
year = 1998,
Expand Down Expand Up @@ -758,7 +758,7 @@ @TechReport{Culver1999
Title = "Intrinsic scale for boundary representation of
two-dimensional objects",
Institution = "MIDAG, University of North Carolina at Chapel Hill",
annote = "http://www.cs.unc.edu/~culver",
annote = "https://www.cs.unc.edu/~culver",
year = 1999,
}

Expand Down Expand Up @@ -832,7 +832,7 @@ @TechReport{Deriche1993
@Book{Darwin1999,
Author = "C. Darwin",
Title = "On the Origin of Species",
Publisher = "http://www.gutenberg.org",
Publisher = "https://www.gutenberg.org",
Edition = "sixth",
year = 1999,
}
Expand Down Expand Up @@ -1796,7 +1796,7 @@ @Manual{ITKSoftwareGuide
Title = {The {ITK} {S}oftware {G}uide},
Author = {Ibanez, L. and Schroeder, W.},
Organization = "Kitware, Inc. ISBN 1-930934-10-6",
Address = {http://www.itk.org/ItkSoftwareGuide.pdf},
Address = {https://www.itk.org/ItkSoftwareGuide.pdf},
year = 2003,
}

Expand Down Expand Up @@ -3454,7 +3454,7 @@ @Manual{OpenGLSpecification
Title = "The OpenGL Graphics System: A Specification (Version
1.2)",
Author = "M. Segal and K. Akeley",
Address = "http://www.opengl.org",
Address = "https://www.opengl.org",
month = "march",
year = 1998,
}
Expand Down Expand Up @@ -3872,7 +3872,7 @@ @TechReport{Udupa1998
Author = "J. K. Udupa and S. Samarasekera",
Title = "Extraction of fuzzy object information in multidimensional images for quantifying MS lesions of the brain",
year = 1998,
Institution = "United States Patent Office http://www.uspto.gov",
Institution = "United States Patent Office https://www.uspto.gov",
Number = "5,812,691"
}

Expand Down Expand Up @@ -4767,7 +4767,7 @@ @Manual{CreatisINSA-Lyon
Title = "The GDCM Library",
Institution = "CREATIS (France)",
Organization = "CNRS, INSERM, INSA Lyon, UCB Lyon",
Address = "http://www-creatis.insa-lyon.fr/Public/Gdcm/"
Address = "https://www.creatis.insa-lyon.fr/Public/Gdcm/"
}

@InProceedings{Chung2002,
Expand Down
4 changes: 2 additions & 2 deletions doc/local.bib
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ @article{Schavemaker2000
number = {6},
year = {2000},
pages = {997-1012},
ee = {http://dx.doi.org/10.1016/S0031-3203(99)00160-0},
bibsource = {DBLP, http://dblp.uni-trier.de}
ee = {https://dx.doi.org/10.1016/S0031-3203(99)00160-0},
bibsource = {DBLP, https://dblp.uni-trier.de}
}
4 changes: 2 additions & 2 deletions include/itkBinaryCloseParaImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -55,7 +55,7 @@ namespace itk
* Core methods described in the InsightJournal article:
* "Morphology with parabolic structuring elements"
*
* http://hdl.handle.net/1926/1370
* https://hdl.handle.net/1926/1370
*
* \sa itkParabolicErodeImageFilter
*
Expand Down
2 changes: 1 addition & 1 deletion include/itkBinaryCloseParaImageFilter.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions include/itkBinaryDilateParaImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -53,7 +53,7 @@ namespace itk
* Core methods described in the InsightJournal article:
* "Morphology with parabolic structuring elements"
*
* http://hdl.handle.net/1926/1370
* https://hdl.handle.net/1926/1370
*
* \sa itkParabolicDilateImageFilter
*
Expand Down
2 changes: 1 addition & 1 deletion include/itkBinaryDilateParaImageFilter.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions include/itkBinaryErodeParaImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -53,7 +53,7 @@ namespace itk
* Core methods described in the InsightJournal article:
* "Morphology with parabolic structuring elements"
*
* http://hdl.handle.net/1926/1370
* https://hdl.handle.net/1926/1370
*
* \sa itkParabolicErodeImageFilter
*
Expand Down
2 changes: 1 addition & 1 deletion include/itkBinaryErodeParaImageFilter.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions include/itkBinaryOpenParaImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -55,7 +55,7 @@ namespace itk
* Core methods described in the InsightJournal article:
* "Morphology with parabolic structuring elements"
*
* http://hdl.handle.net/1926/1370
* https://hdl.handle.net/1926/1370
* \sa itkParabolicErodeImageFilter
*
*
Expand Down
2 changes: 1 addition & 1 deletion include/itkBinaryOpenParaImageFilter.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion include/itkGreaterEqualValImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion include/itkMorphSDTHelperImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions include/itkMorphologicalDistanceTransformImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -46,7 +46,7 @@ namespace itk
* Core methods described in the InsightJournal article:
* "Morphology with parabolic structuring elements"
*
* http://hdl.handle.net/1926/1370
* https://hdl.handle.net/1926/1370
*
* \ingroup ParabolicMorphology
*
Expand Down
2 changes: 1 addition & 1 deletion include/itkMorphologicalDistanceTransformImageFilter.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions include/itkMorphologicalSharpeningImageFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -46,14 +46,14 @@ namespace itk
* number = {6},
* year = {2000},
* pages = {997-1012},
* ee = {http://dx.doi.org/10.1016/S0031-3203(99)00160-0},
* bibsource = {DBLP, http://dblp.uni-trier.de}
* ee = {https://dx.doi.org/10.1016/S0031-3203(99)00160-0},
* bibsource = {DBLP, https://dblp.uni-trier.de}
}
* Core methods described in the InsightJournal article:
* "Morphology with parabolic structuring elements"
*
* http://hdl.handle.net/1926/1370
* https://hdl.handle.net/1926/1370
*
*
* \ingroup ParabolicMorphology
Expand Down
Loading

0 comments on commit 2c6aa18

Please sign in to comment.