Skip to content

Commit 305e3f3

Browse files
authored
Merge pull request #63 from thewtex/post2
ENH: Build against itk 5.1.0.post2
2 parents 5cdccb1 + bb3ac00 commit 305e3f3

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

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

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ jobs:
7676
operating_system="${{ matrix.os }}"
7777
cat > dashboard.cmake << EOF
7878
set(CTEST_SITE "GitHubActions")
79-
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/.." CTEST_DASHBOARD_ROOT)
80-
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/" CTEST_SOURCE_DIRECTORY)
81-
file(TO_CMAKE_PATH "${GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY)
79+
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/.." CTEST_DASHBOARD_ROOT)
80+
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/" CTEST_SOURCE_DIRECTORY)
81+
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY)
8282
set(dashboard_source_name "${GITHUB_REPOSITORY}")
8383
if(ENV{GITHUB_REF} MATCHES "master")
8484
set(branch "-master")
@@ -114,13 +114,13 @@ jobs:
114114
- name: Build and test
115115
if: matrix.os != 'windows-2019'
116116
run: |
117-
ctest -j 2 -V -S dashboard.cmake
117+
ctest --output-on-failure -j 2 -V -S dashboard.cmake
118118
119119
- name: Build and test
120120
if: matrix.os == 'windows-2019'
121121
run: |
122122
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
123-
ctest -j 2 -V -S dashboard.cmake
123+
ctest --output-on-failure -j 2 -V -S dashboard.cmake
124124
shell: cmd
125125

126126
build-linux-python-packages:
@@ -130,7 +130,7 @@ jobs:
130130
matrix:
131131
python-version: [35, 36, 37, 38]
132132
include:
133-
- itk-python-git-tag: "v5.1.0"
133+
- itk-python-git-tag: "v5.1.0.post2"
134134

135135
steps:
136136
- uses: actions/checkout@v2
@@ -166,7 +166,7 @@ jobs:
166166
max-parallel: 2
167167
matrix:
168168
include:
169-
- itk-python-git-tag: "v5.1.0"
169+
- itk-python-git-tag: "v5.1.0.post2"
170170

171171
steps:
172172
- uses: actions/checkout@v2
@@ -195,10 +195,12 @@ jobs:
195195
matrix:
196196
python-version-minor: [5, 6, 7, 8]
197197
include:
198-
- itk-python-git-tag: "v5.1.0"
198+
- itk-python-git-tag: "v5.1.0.post2"
199199

200200
steps:
201201
- uses: actions/checkout@v2
202+
with:
203+
path: "im"
202204

203205
- name: 'Install Python'
204206
run: |
@@ -209,6 +211,8 @@ jobs:
209211
- name: 'Fetch build dependencies'
210212
shell: bash
211213
run: |
214+
mv im ../../
215+
cd ../../
212216
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
213217
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
214218
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
@@ -219,17 +223,18 @@ jobs:
219223
- name: 'Build 🐍 Python 📦 package'
220224
shell: cmd
221225
run: |
226+
cd ../../im
222227
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
223228
set PATH="C:\P\grep;%PATH%"
224229
set CC=cl.exe
225230
set CXX=cl.exe
226-
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"
231+
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
227232
228233
- name: Publish Python package as GitHub Artifact
229234
uses: actions/upload-artifact@v1
230235
with:
231236
name: WindowWheel3.${{ matrix.python-version-minor }}
232-
path: dist
237+
path: ../../im/dist
233238

234239
publish-python-packages-to-pypi:
235240
needs:

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-cuberille',
16-
version='2.2.0',
16+
version='2.3.0',
1717
author='Dan Mueller',
1818
author_email='[email protected]',
1919
packages=['itk'],
@@ -44,6 +44,6 @@
4444
keywords='ITK InsightToolkit',
4545
url=r'https://itk.org/',
4646
install_requires=[
47-
r'itk>=5.1.0'
47+
r'itk>=5.1.0.post2'
4848
]
4949
)

0 commit comments

Comments
 (0)