From e38e8a3c5af0ffc6ee208e44b805b817d9836ab2 Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Tue, 31 May 2022 11:26:56 -0400 Subject: [PATCH] ENH: Bump ITK and replace http with https using script --- .clang-format | 2 +- .github/workflows/build-test-package.yml | 18 +++++++++--------- LICENSE | 4 ++-- README.rst | 4 ++-- examples/InvertDisplacementField.cxx | 2 +- ...dPointInverseDisplacementFieldImageFilter.h | 2 +- ...ointInverseDisplacementFieldImageFilter.hxx | 2 +- setup.py | 2 +- .../FixedPointInverseDisplacementFieldTest.cxx | 2 +- 9 files changed, 19 insertions(+), 19 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 e430573..22bbb1b 100644 --- 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: @@ -135,9 +135,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 @@ -173,7 +173,7 @@ jobs: max-parallel: 2 matrix: include: - - itk-python-git-tag: "v5.2rc01" + - itk-python-git-tag: "v5.3rc04" steps: - uses: actions/checkout@v2 @@ -207,9 +207,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 @@ -242,7 +242,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" 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 1384696..c604475 100644 --- a/README.rst +++ b/README.rst @@ -17,8 +17,8 @@ The FixedPointInverseDisplacementFieldImageFilter has been implemented and descr Luethi M. "Inverting Displacement fields using a fixed point iteration scheme." - http://hdl.handle.net/10380/3222 - http://www.insight-journal.org/browse/publication/768 + https://hdl.handle.net/10380/3222 + https://www.insight-journal.org/browse/publication/768 October 2010. Since ITK 4.10.0, this module is available in the ITK source tree as a Remote diff --git a/examples/InvertDisplacementField.cxx b/examples/InvertDisplacementField.cxx index 37e9e7e..49a6a64 100644 --- a/examples/InvertDisplacementField.cxx +++ b/examples/InvertDisplacementField.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/include/itkFixedPointInverseDisplacementFieldImageFilter.h b/include/itkFixedPointInverseDisplacementFieldImageFilter.h index 38333cf..97cb9dc 100644 --- a/include/itkFixedPointInverseDisplacementFieldImageFilter.h +++ b/include/itkFixedPointInverseDisplacementFieldImageFilter.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/itkFixedPointInverseDisplacementFieldImageFilter.hxx b/include/itkFixedPointInverseDisplacementFieldImageFilter.hxx index 0aaebf6..3f3499f 100644 --- a/include/itkFixedPointInverseDisplacementFieldImageFilter.hxx +++ b/include/itkFixedPointInverseDisplacementFieldImageFilter.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 e3349aa..72d9ef4 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ 'fixed-point approach.\n' 'Please refer to:\n' 'M. Luethi, "Inverting deformation fields using a fixed point iteration scheme.", ' - 'Insight Journal, July-December 2010, http://hdl.handle.net/10380/3222.', + 'Insight Journal, July-December 2010, https://hdl.handle.net/10380/3222.', classifiers=[ "License :: OSI Approved :: Apache Software License", "Programming Language :: Python", diff --git a/test/FixedPointInverseDisplacementFieldTest.cxx b/test/FixedPointInverseDisplacementFieldTest.cxx index 3b8a649..7f16ddc 100644 --- a/test/FixedPointInverseDisplacementFieldTest.cxx +++ b/test/FixedPointInverseDisplacementFieldTest.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,