From 69cca7398ba616c372db79564194c7feb06695c1 Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Tue, 31 May 2022 13:36:50 -0400 Subject: [PATCH] ENH: Bump ITK and change http to https --- .clang-format | 2 +- .github/workflows/build-test-package.yml | 2 +- LICENSE | 4 +-- README.rst | 6 ++-- doc/ITKStrain.tex | 2 +- doc/InsightArticle.cls | 4 +-- doc/InsightJournal.bib | 28 +++++++++---------- doc/InsightJournal.sty | 6 ++-- include/itkSplitComponentsImageFilter.h | 2 +- include/itkSplitComponentsImageFilter.hxx | 2 +- include/itkStrainImageFilter.h | 2 +- include/itkStrainImageFilter.hxx | 2 +- include/itkTransformToStrainFilter.h | 2 +- include/itkTransformToStrainFilter.hxx | 2 +- setup.py | 2 +- test/ReadInDisplacements.h | 2 +- test/WriteOutStrains.h | 2 +- test/itkStrainImageFilterDoGTest.cxx | 2 +- ...StrainImageFilterRecursiveGaussianTest.cxx | 2 +- test/itkStrainImageFilterTest.cxx | 2 +- test/itkTransformToStrainFilterTest.cxx | 2 +- 21 files changed, 40 insertions(+), 40 deletions(-) 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/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 25de1e7..1ecade3 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -3,7 +3,7 @@ name: Build, test, package on: [push,pull_request] env: - itk-git-tag: "801370c025c7d296783481779a41c6d559c992c5" + itk-git-tag: "d6acfd26bfcdec606d605beb1301bddfb17c05a6" itk-wheel-tag: "v5.3rc04" jobs: diff --git a/LICENSE b/LICENSE index d645695..62589ed 100644 --- 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 index e7f1845..c218c92 100644 --- a/README.rst +++ b/README.rst @@ -17,13 +17,13 @@ Overview This repository contains `ITK `_ filters to estimate a strain tensor field from a displacement field or a spatial transformation. -For more information, see the `Insight Journal article `_:: +For more information, see the `Insight Journal article `_:: McCormick M. N-Dimensional Computation of Strain Tensor Images in the Insight Toolkit The Insight Journal. January-December. 2017. - http://hdl.handle.net/10380/3573 - http://insight-journal.org/browse/publication/984 + https://hdl.handle.net/10380/3573 + https://insight-journal.org/browse/publication/984 Installation diff --git a/doc/ITKStrain.tex b/doc/ITKStrain.tex index 04f4e97..7110d7c 100644 --- a/doc/ITKStrain.tex +++ b/doc/ITKStrain.tex @@ -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} diff --git a/doc/InsightArticle.cls b/doc/InsightArticle.cls index 1a05468..5111e48 100644 --- a/doc/InsightArticle.cls +++ b/doc/InsightArticle.cls @@ -76,11 +76,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}{ diff --git a/doc/InsightJournal.bib b/doc/InsightJournal.bib index f543b4a..99b3fcd 100644 --- a/doc/InsightJournal.bib +++ b/doc/InsightJournal.bib @@ -43,7 +43,7 @@ @misc{WikipediaStrainTheory @Manual{POVRay, Title = "Persistence of Vision, Ray-Tracer", - Address = "http://www.povray.org", + Address = "https://www.povray.org", } @Book{Romeny1994, @@ -63,7 +63,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, @@ -766,7 +766,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, } @@ -840,7 +840,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, } @@ -1804,8 +1804,8 @@ @Manual{ITKSoftwareGuide Title = {The {ITK} {S}oftware {G}uide}, Author = {Ibanez, L. and Schroeder, W. and Ng, L. and Cates, J.}, Organization = "Kitware, Inc. ISBN 1-930934-10-6", - Address = {http://www.itk.org/ItkSoftwareGuide.pdf}, - url = {http://www.itk.org/ItkSoftwareGuide.pdf}, + Address = {https://www.itk.org/ItkSoftwareGuide.pdf}, + url = {https://www.itk.org/ItkSoftwareGuide.pdf}, Publisher = {Kitware Inc.}, Edition = {First}, year = 2003, @@ -1815,8 +1815,8 @@ @Manual{ITKSoftwareGuideSecondEdition Title = {The {ITK} {S}oftware {G}uide}, Author = {Ibanez, L. and Schroeder, W. and Ng, L. and Cates, J.}, Organization = "Kitware, Inc. ISBN 1-930934-15-7", - Address = {http://www.itk.org/ItkSoftwareGuide.pdf}, - url = {http://www.itk.org/ItkSoftwareGuide.pdf}, + Address = {https://www.itk.org/ItkSoftwareGuide.pdf}, + url = {https://www.itk.org/ItkSoftwareGuide.pdf}, Publisher = {Kitware Inc.}, Edition = {Second}, year = 2005, @@ -3477,7 +3477,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, } @@ -3895,7 +3895,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" } @@ -4790,7 +4790,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, @@ -4813,7 +4813,7 @@ @TechReport{DICOMStandard Author = "NEMA", Title = "The DICOM Standard", Institution = "NEMA", - Address = "\url{http://dicom.nema.org/}", + Address = "\url{https://dicom.nema.org/}", Publisher = "National Electical Manufacturers Association", Year = 2014 } @@ -4841,7 +4841,7 @@ @Manual{OpenJPEG Title = "OpenJPEG", Institution = "Communications and Remote Sensing Laboratory (TELE)", Organization = "Universit\'{e} Catholique de Louvain (UCL), Belgium", - Address = "http://www.openjpeg.org" + Address = "https://www.openjpeg.org" } @TechReport{JPEG2000KeyAdvantages, @@ -4850,7 +4850,7 @@ @TechReport{JPEG2000KeyAdvantages Institution = "Aware Inc.", Year = 2002, Month = "February", - Address = "http://medical.nema.org/Dicom/minutes/WG-04/2002/2002-02-27/Weisfeiler.doc" + Address = "https://medical.nema.org/Dicom/minutes/WG-04/2002/2002-02-27/Weisfeiler.doc" } @inproceedings{ marcellin00overview, diff --git a/doc/InsightJournal.sty b/doc/InsightJournal.sty index 9860e76..62a3be4 100644 --- a/doc/InsightJournal.sty +++ b/doc/InsightJournal.sty @@ -1108,11 +1108,11 @@ % Commands for adding the link reference to the URL in the Insight Journal % \newcommand{\urlhandle}[1]{ -\url{http://hdl.handle.net/10380/#1}} +\url{https://hdl.handle.net/10380/#1}} \newcommand{\IJhandle}[1]{ -Latest version available at the \href{http://www.insight-journal.org}{Insight Journal} [\urlhandle{#1}]\\ -Distributed under \href{http://creativecommons.org/licenses/by/3.0/us/}{Creative Commons Attribution License}} +Latest version available at the \href{https://www.insight-journal.org}{Insight Journal} [\urlhandle{#1}]\\ +Distributed under \href{https://creativecommons.org/licenses/by/3.0/us/}{Creative Commons Attribution License}} \newcommand{\IJhandlefooter}[1]{ \fancyfoot[CO,CE]{ diff --git a/include/itkSplitComponentsImageFilter.h b/include/itkSplitComponentsImageFilter.h index 3954609..107e312 100644 --- a/include/itkSplitComponentsImageFilter.h +++ b/include/itkSplitComponentsImageFilter.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/itkSplitComponentsImageFilter.hxx b/include/itkSplitComponentsImageFilter.hxx index f98e2a4..911365f 100644 --- a/include/itkSplitComponentsImageFilter.hxx +++ b/include/itkSplitComponentsImageFilter.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/itkStrainImageFilter.h b/include/itkStrainImageFilter.h index 67484c0..4e9ca61 100644 --- a/include/itkStrainImageFilter.h +++ b/include/itkStrainImageFilter.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/itkStrainImageFilter.hxx b/include/itkStrainImageFilter.hxx index 7ba377d..66b9a2a 100644 --- a/include/itkStrainImageFilter.hxx +++ b/include/itkStrainImageFilter.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/itkTransformToStrainFilter.h b/include/itkTransformToStrainFilter.h index f2a5855..6ac08df 100644 --- a/include/itkTransformToStrainFilter.h +++ b/include/itkTransformToStrainFilter.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/itkTransformToStrainFilter.hxx b/include/itkTransformToStrainFilter.hxx index 3fcc7e3..8c4a363 100644 --- a/include/itkTransformToStrainFilter.hxx +++ b/include/itkTransformToStrainFilter.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 index 96b1220..6605420 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ 'Eulerian-Almansi strain can be generated.\n' 'Please refer to:\n' 'M. McCormick, "N-Dimensional Computation of Strain Tensor Images in the Insight Toolkit.", ' - 'Insight Journal, January-December 2017, http://hdl.handle.net/10380/3573', + 'Insight Journal, January-December 2017, https://hdl.handle.net/10380/3573', classifiers=[ "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", diff --git a/test/ReadInDisplacements.h b/test/ReadInDisplacements.h index ec56a3d..83f331a 100644 --- a/test/ReadInDisplacements.h +++ b/test/ReadInDisplacements.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/test/WriteOutStrains.h b/test/WriteOutStrains.h index dc14a1a..33407ce 100644 --- a/test/WriteOutStrains.h +++ b/test/WriteOutStrains.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/test/itkStrainImageFilterDoGTest.cxx b/test/itkStrainImageFilterDoGTest.cxx index 8d77eb0..2d70c58 100644 --- a/test/itkStrainImageFilterDoGTest.cxx +++ b/test/itkStrainImageFilterDoGTest.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/itkStrainImageFilterRecursiveGaussianTest.cxx b/test/itkStrainImageFilterRecursiveGaussianTest.cxx index fcfe9bb..442a506 100644 --- a/test/itkStrainImageFilterRecursiveGaussianTest.cxx +++ b/test/itkStrainImageFilterRecursiveGaussianTest.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/itkStrainImageFilterTest.cxx b/test/itkStrainImageFilterTest.cxx index 6a835ce..71d552a 100644 --- a/test/itkStrainImageFilterTest.cxx +++ b/test/itkStrainImageFilterTest.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/itkTransformToStrainFilterTest.cxx b/test/itkTransformToStrainFilterTest.cxx index 4ffe20f..fd12809 100644 --- a/test/itkTransformToStrainFilterTest.cxx +++ b/test/itkTransformToStrainFilterTest.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,