Skip to content

Commit 71a190d

Browse files
authored
Merge pull request #24 from Leengit/itk_5.2
ENH: Update CI for ITK v5.2rc03+
2 parents d98c77c + 050f453 commit 71a190d

File tree

4 files changed

+30
-14
lines changed

4 files changed

+30
-14
lines changed

.github/workflows/build-test-package.yml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
- os: ubuntu-18.04
1414
c-compiler: "gcc"
1515
cxx-compiler: "g++"
16-
itk-git-tag: "v5.1.0"
16+
itk-git-tag: "7548a390d71dc25b80e792703ee3cfea17853a99"
1717
cmake-build-type: "MinSizeRel"
1818
- os: windows-2019
1919
c-compiler: "cl.exe"
2020
cxx-compiler: "cl.exe"
21-
itk-git-tag: "v5.1.0"
21+
itk-git-tag: "7548a390d71dc25b80e792703ee3cfea17853a99"
2222
cmake-build-type: "Release"
2323
- os: macos-10.15
2424
c-compiler: "clang"
2525
cxx-compiler: "clang++"
26-
itk-git-tag: "v5.1.0"
26+
itk-git-tag: "7548a390d71dc25b80e792703ee3cfea17853a99"
2727
cmake-build-type: "MinSizeRel"
2828

2929
steps:
@@ -39,6 +39,9 @@ jobs:
3939
python -m pip install --upgrade pip
4040
python -m pip install ninja
4141
42+
- name: Get specific version of CMake, Ninja
43+
uses: lukka/get-cmake@v3.18.3
44+
4245
- name: Download ITK
4346
run: |
4447
cd ..
@@ -100,6 +103,9 @@ jobs:
100103
set(dashboard_no_clean 1)
101104
set(ENV{CC} ${{ matrix.c-compiler }})
102105
set(ENV{CXX} ${{ matrix.cxx-compiler }})
106+
if(WIN32)
107+
set(ENV{PATH} "\${CTEST_DASHBOARD_ROOT}/ITK-build/bin;\$ENV{PATH}")
108+
endif()
103109
set(dashboard_cache "
104110
ITK_DIR:PATH=\${CTEST_DASHBOARD_ROOT}/ITK-build
105111
BUILD_TESTING:BOOL=ON
@@ -128,9 +134,9 @@ jobs:
128134
strategy:
129135
max-parallel: 2
130136
matrix:
131-
python-version: [35, 36, 37, 38]
137+
python-version: [36, 37, 38, 39]
132138
include:
133-
- itk-python-git-tag: "v5.1.0.post2"
139+
- itk-python-git-tag: "v5.2rc03"
134140

135141
steps:
136142
- uses: actions/checkout@v2
@@ -166,11 +172,18 @@ jobs:
166172
max-parallel: 2
167173
matrix:
168174
include:
169-
- itk-python-git-tag: "v5.1.0.post2"
175+
- itk-python-git-tag: "v5.2rc03"
170176

171177
steps:
172178
- uses: actions/checkout@v2
173179

180+
- name: 'Specific XCode version'
181+
run: |
182+
sudo xcode-select -s "/Applications/Xcode_11.7.app"
183+
184+
- name: Get specific version of CMake, Ninja
185+
uses: lukka/get-cmake@v3.18.3
186+
174187
- name: 'Fetch build script'
175188
run: |
176189
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
@@ -193,11 +206,14 @@ jobs:
193206
strategy:
194207
max-parallel: 2
195208
matrix:
196-
python-version-minor: [5, 6, 7, 8]
209+
python-version-minor: [6, 7, 8, 9]
197210
include:
198-
- itk-python-git-tag: "v5.1.0.post2"
211+
- itk-python-git-tag: "v5.2rc03"
199212

200213
steps:
214+
- name: Get specific version of CMake, Ninja
215+
uses: lukka/get-cmake@v3.18.3
216+
201217
- uses: actions/checkout@v2
202218
with:
203219
path: "im"
@@ -233,7 +249,7 @@ jobs:
233249
- name: Publish Python package as GitHub Artifact
234250
uses: actions/upload-artifact@v1
235251
with:
236-
name: WindowWheel3.${{ matrix.python-version-minor }}
252+
name: WindowsWheel3.${{ matrix.python-version-minor }}
237253
path: ../../im/dist
238254

239255
publish-python-packages-to-pypi:

binder/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
itk-spcn
2-
itkwidgets==0.30.1
2+
itkwidgets

setup.py

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

1717
setup(
1818
name='itk-spcn',
19-
version='0.1.2',
19+
version='0.1.3',
2020
author='Lee Newberg',
2121
author_email='lee.newberg@kitware.com',
2222
packages=['itk'],
@@ -47,6 +47,6 @@
4747
keywords='ITK InsightToolkit',
4848
url=r'https://github.com/InsightSoftwareConsortium/ITKColorNormalization/',
4949
install_requires=[
50-
r'itk>=5.1.0.post3'
50+
r'itk>=5.2rc3'
5151
]
5252
)

test/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
2-
ITKGitTag: v5.1.0
3-
ITKPythonGitTag: v5.1.0
2+
ITKGitTag: v5.2rc03
3+
ITKPythonGitTag: v5.2rc03
44
CMakeBuildType: Release
55

66
trigger:

0 commit comments

Comments
 (0)