Skip to content

Commit 8f79eda

Browse files
authored
Merge pull request #130 from thewtex/python-version-bump
ENH: Build against ITK 5.0.1 and bump Python package version
2 parents 92f5779 + 93cf461 commit 8f79eda

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
setup(
1515
name='itk-isotropicwavelets',
16-
version='0.5.3',
16+
version='0.5.4',
1717
author='Pablo Hernandez-Cerdan',
1818
author_email='pablo.hernandez.cerdan@outlook.com',
1919
packages=['itk'],
@@ -54,6 +54,6 @@
5454
keywords='ITK InsightToolkit Wavelet Pyramid Steerable Riesz',
5555
url=r'https://github.com/InsightSoftwareConsortium/ITKIsotropicWavelets',
5656
install_requires=[
57-
r'itk>=5.0.0',
57+
r'itk>=5.0.1',
5858
]
5959
)

test/azure-pipelines.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
variables:
2-
ITKGitTag: v5.0rc01
2+
ITKGitTag: v5.0.1
3+
ITKPythonGitTag: v5.0.1
34
CMakeBuildType: Release
45

56
trigger:
@@ -57,7 +58,9 @@ jobs:
5758
displayName: 'Install build dependencies'
5859
5960
- script: |
60-
git clone --depth 5 --branch $(ITKGitTag) https://github.com/InsightSoftwareConsortium/ITK.git
61+
git clone https://github.com/InsightSoftwareConsortium/ITK.git
62+
cd ITK
63+
git checkout $(ITKGitTag)
6164
workingDirectory: $(Agent.BuildDirectory)
6265
displayName: 'Download ITK'
6366
@@ -156,7 +159,7 @@ jobs:
156159
displayName: 'Fetch build script'
157160
158161
- script: |
159-
export ITK_PACKAGE_VERSION=$(ITKGitTag)
162+
export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
160163
./dockcross-manylinux-download-cache-and-build-module-wheels.sh
161164
displayName: 'Build Python packages'
162165
@@ -180,7 +183,7 @@ jobs:
180183
displayName: 'Fetch build script'
181184
182185
- script: |
183-
export ITK_PACKAGE_VERSION=$(ITKGitTag)
186+
export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
184187
./macpython-download-cache-and-build-module-wheels.sh
185188
displayName: 'Build Python packages'
186189
@@ -204,7 +207,7 @@ jobs:
204207
205208
- script: |
206209
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
207-
set ITK_PACKAGE_VERSION=$(ITKGitTag)
210+
set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
208211
set CC=cl.exe
209212
set CXX=cl.exe
210213
powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1

0 commit comments

Comments
 (0)