From 8338b08bfe3b582d3dfe948f1daf13347c1f0043 Mon Sep 17 00:00:00 2001 From: Tom Birdsong Date: Tue, 31 May 2022 13:24:18 -0400 Subject: [PATCH] ENH: Bump ITK and change http to https --- .clang-format | 2 +- .github/workflows/build-test-package.yml | 18 +++++++++--------- LICENSE | 4 ++-- include/itkScancoImageIO.h | 2 +- include/itkScancoImageIOFactory.h | 2 +- src/itkScancoImageIO.cxx | 2 +- src/itkScancoImageIOFactory.cxx | 2 +- test/itkScancoImageIOTest.cxx | 2 +- test/itkScancoImageIOTest2.cxx | 2 +- test/itkScancoImageIOTest3.cxx | 2 +- 10 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 b826fb4..426cb84 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: @@ -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.2.0" + - 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.2.0" + - 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.2.0" + - itk-python-git-tag: "v5.3rc04" steps: - name: Get specific version of CMake, Ninja @@ -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 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/include/itkScancoImageIO.h b/include/itkScancoImageIO.h index 5ba0fe9..3706f9c 100644 --- a/include/itkScancoImageIO.h +++ b/include/itkScancoImageIO.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/itkScancoImageIOFactory.h b/include/itkScancoImageIOFactory.h index 5cc4c2a..3a33a2f 100644 --- a/include/itkScancoImageIOFactory.h +++ b/include/itkScancoImageIOFactory.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/src/itkScancoImageIO.cxx b/src/itkScancoImageIO.cxx index fe017cf..3e5867e 100644 --- a/src/itkScancoImageIO.cxx +++ b/src/itkScancoImageIO.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/src/itkScancoImageIOFactory.cxx b/src/itkScancoImageIOFactory.cxx index abff2cd..36b826f 100644 --- a/src/itkScancoImageIOFactory.cxx +++ b/src/itkScancoImageIOFactory.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/itkScancoImageIOTest.cxx b/test/itkScancoImageIOTest.cxx index c539a6a..f56ca07 100644 --- a/test/itkScancoImageIOTest.cxx +++ b/test/itkScancoImageIOTest.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/itkScancoImageIOTest2.cxx b/test/itkScancoImageIOTest2.cxx index 2ee659a..4dbb5dc 100644 --- a/test/itkScancoImageIOTest2.cxx +++ b/test/itkScancoImageIOTest2.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/itkScancoImageIOTest3.cxx b/test/itkScancoImageIOTest3.cxx index 474e4e5..b86a6ef 100644 --- a/test/itkScancoImageIOTest3.cxx +++ b/test/itkScancoImageIOTest3.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,