Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ set(BUILD_TESTING OFF)
set(_itk_build_shared ${BUILD_SHARED_LIBS})
set(BUILD_SHARED_LIBS OFF)
set(elastix_GIT_REPOSITORY "https://github.com/thewtex/elastix.git")
set(elastix_GIT_TAG "9de795ed53f85a05f188c11beed1b251d459e201")
set(elastix_GIT_TAG "a13be5c2daa1d2b8454609366aef3cba194be8c2")
FetchContent_Declare(
elastix_fetch
GIT_REPOSITORY ${elastix_GIT_REPOSITORY}
Expand Down
2 changes: 1 addition & 1 deletion include/itkElastixRegistrationMethod.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*=========================================================================
*
* Copyright Insight Software Consortium
* Copyright NumFOCUS
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/itkElastixRegistrationMethod.hxx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*=========================================================================
*
* Copyright Insight Software Consortium
* Copyright NumFOCUS
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/itkTransformixFilter.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*=========================================================================
*
* Copyright Insight Software Consortium
* Copyright NumFOCUS
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion include/itkTransformixFilter.hxx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*=========================================================================
*
* Copyright Insight Software Consortium
* Copyright NumFOCUS
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

setup(
name=package_name,
version='0.5.1',
version='0.6.0',
author='Insight Software Consortium',
author_email='itk+community@discourse.itk.org',
packages=['itk'],
Expand Down Expand Up @@ -49,6 +49,6 @@
keywords='ITK InsightToolkit',
url=r'https://itk.org/',
install_requires=[
r'itk>=5.1rc1'
r'itk>=5.1.0'
]
)
24 changes: 12 additions & 12 deletions test/azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
variables:
ITKGitTag: v5.1rc01
ITKPythonGitTag: v5.1rc01
ITKGitTag: v5.1.0
ITKPythonGitTag: v5.1.0
CMakeBuildType: Release

trigger:
Expand All @@ -19,20 +19,20 @@ jobs:
strategy:
matrix:
Linux:
imageName: 'ubuntu-16.04'
imageName: 'ubuntu-18.04'
cCompiler: gcc
cxxCompiler: g++
compilerInitialization: ''
macOS:
imageName: 'macos-10.13'
imageName: 'macos-10.15'
cCompiler: clang
cxxCompiler: clang++
compilerInitialization: ''
Windows:
imageName: 'vs2017-win2016'
imageName: 'windows-2019'
cCompiler: cl.exe
cxxCompiler: cl.exe
compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'
compilerInitialization: 'call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"'

pool:
vmImage: $(imageName)
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
cancelTimeoutInMinutes: 300
displayName: "Build Linux Python packages"
pool:
vmImage: 'Ubuntu-16.04'
vmImage: 'Ubuntu-18.04'

steps:
- script: |
Expand All @@ -174,7 +174,7 @@ jobs:
timeoutInMinutes: 0
cancelTimeoutInMinutes: 300
pool:
vmImage: 'macos-10.14'
vmImage: 'macos-10.15'

steps:
- script: |
Expand All @@ -198,15 +198,15 @@ jobs:
timeoutInMinutes: 0
cancelTimeoutInMinutes: 300
pool:
vmImage: 'vs2017-win2016'
vmImage: 'windows-2019'

steps:
- script: |
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/windows-download-cache-and-build-module-wheels.ps1 -O
displayName: 'Fetch build script'

- script: |
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
set CC=cl.exe
set CXX=cl.exe
Expand All @@ -224,7 +224,7 @@ jobs:
cancelTimeoutInMinutes: 300
displayName: "Build Linux Python OpenCL packages"
pool:
vmImage: 'Ubuntu-16.04'
vmImage: 'Ubuntu-18.04'

steps:
- script: |
Expand All @@ -243,7 +243,7 @@ jobs:
cancelTimeoutInMinutes: 300
displayName: "Build macOS Python OpenCL packages"
pool:
vmImage: 'macos-10.14'
vmImage: 'macos-10.15'

steps:
- script: |
Expand Down
2 changes: 1 addition & 1 deletion test/itkElastixRegistrationMethodTest.cxx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*=========================================================================
*
* Copyright Insight Software Consortium
* Copyright NumFOCUS
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
5 changes: 1 addition & 4 deletions wrapping/dockcross-manylinux-build-module-wheels-opencl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
#
# scripts/dockcross-manylinux-build-module-wheels.sh cp27mu cp35

# Pull dockcross manylinux images
docker pull dockcross/manylinux-x64

# Generate dockcross scripts
docker run dockcross/manylinux-x64 > /tmp/dockcross-manylinux-x64
docker run --rm dockcross/manylinux1-x64:20200416-a6b6635 > /tmp/dockcross-manylinux-x64
chmod u+x /tmp/dockcross-manylinux-x64

script_dir=$(cd $(dirname $0) || exit 1; pwd)
Expand Down
2 changes: 1 addition & 1 deletion wrapping/dockcross-manylinux-download-cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ curl https://data.kitware.com/api/v1/file/592dd8068d777f16d01e1a92/download -o z
gunzip -d zstd-1.2.0-linux.tar.gz
tar xf zstd-1.2.0-linux.tar

curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.0.1}/ITKPythonBuilds-linux.tar.zst -O
curl -L https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${ITK_PACKAGE_VERSION:=v5.1.0}/ITKPythonBuilds-linux.tar.zst -O
./zstd-1.2.0-linux/bin/unzstd ITKPythonBuilds-linux.tar.zst -o ITKPythonBuilds-linux.tar
tar xf ITKPythonBuilds-linux.tar

Expand Down
2 changes: 1 addition & 1 deletion wrapping/test/itkElastixRegistrationMethodTest.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#==========================================================================
#
# Copyright Insight Software Consortium
# Copyright NumFOCUS
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down