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 b540bb4 commit e38e8a3
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .clang-format
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
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 @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions 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

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
4 changes: 2 additions & 2 deletions README.rst
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/InvertDisplacementField.cxx
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/itkFixedPointInverseDisplacementFieldImageFilter.h
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 @@ -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 setup.py
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/FixedPointInverseDisplacementFieldTest.cxx
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

0 comments on commit e38e8a3

Please sign in to comment.