Skip to content

Commit ac79466

Browse files
committed
ENH: Update Python package for itk-5.3rc4
1 parent 8efc307 commit ac79466

File tree

2 files changed

+18
-24
lines changed

2 files changed

+18
-24
lines changed

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

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,29 @@ name: Build, test, package
22

33
on: [push,pull_request]
44

5+
env:
6+
itk-git-tag: "801370c025c7d296783481779a41c6d559c992c5"
7+
itk-wheel-tag: "v5.3rc04"
8+
59
jobs:
610
build-test-cxx:
711
runs-on: ${{ matrix.os }}
812
strategy:
913
max-parallel: 3
1014
matrix:
11-
os: [ubuntu-18.04, windows-2019, macos-10.15]
15+
os: [ubuntu-20.04, windows-2019, macos-10.15]
1216
include:
13-
- os: ubuntu-18.04
17+
- os: ubuntu-20.04
1418
c-compiler: "gcc"
1519
cxx-compiler: "g++"
16-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
1720
cmake-build-type: "MinSizeRel"
1821
- os: windows-2019
1922
c-compiler: "cl.exe"
2023
cxx-compiler: "cl.exe"
21-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
2224
cmake-build-type: "Release"
2325
- os: macos-10.15
2426
c-compiler: "clang"
2527
cxx-compiler: "clang++"
26-
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
2728
cmake-build-type: "MinSizeRel"
2829

2930
steps:
@@ -47,7 +48,7 @@ jobs:
4748
cd ..
4849
git clone https://github.com/InsightSoftwareConsortium/ITK.git
4950
cd ITK
50-
git checkout ${{ matrix.itk-git-tag }}
51+
git checkout ${{ env.itk-git-tag }}
5152
5253
- name: Build ITK
5354
if: matrix.os != 'windows-2019'
@@ -83,8 +84,8 @@ jobs:
8384
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/" CTEST_SOURCE_DIRECTORY)
8485
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY)
8586
set(dashboard_source_name "${GITHUB_REPOSITORY}")
86-
if(ENV{GITHUB_REF} MATCHES "master")
87-
set(branch "-master")
87+
if(ENV{GITHUB_REF} MATCHES "main")
88+
set(branch "-main")
8889
set(dashboard_model "Continuous")
8990
else()
9091
set(branch "-${GITHUB_REF}")
@@ -134,9 +135,7 @@ jobs:
134135
strategy:
135136
max-parallel: 2
136137
matrix:
137-
python-version: [36, 37, 38, 39]
138-
include:
139-
- itk-python-git-tag: "v5.2.0.post2"
138+
python-version: [37, 38, 39, 310]
140139

141140
steps:
142141
- uses: actions/checkout@v2
@@ -157,7 +156,7 @@ jobs:
157156
158157
- name: 'Build 🐍 Python 📦 package'
159158
run: |
160-
export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
159+
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
161160
./dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
162161
163162
- name: Publish Python package as GitHub Artifact
@@ -170,9 +169,6 @@ jobs:
170169
runs-on: macos-10.15
171170
strategy:
172171
max-parallel: 2
173-
matrix:
174-
include:
175-
- itk-python-git-tag: "v5.2.0.post2"
176172

177173
steps:
178174
- uses: actions/checkout@v2
@@ -191,7 +187,7 @@ jobs:
191187
192188
- name: 'Build 🐍 Python 📦 package'
193189
run: |
194-
export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
190+
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
195191
export MACOSX_DEPLOYMENT_TARGET=10.9
196192
./macpython-download-cache-and-build-module-wheels.sh
197193
@@ -206,9 +202,7 @@ jobs:
206202
strategy:
207203
max-parallel: 2
208204
matrix:
209-
python-version-minor: [6, 7, 8, 9]
210-
include:
211-
- itk-python-git-tag: "v5.2.0.post2"
205+
python-version-minor: [7, 8, 9, 10]
212206

213207
steps:
214208
- name: Get specific version of CMake, Ninja
@@ -229,7 +223,7 @@ jobs:
229223
run: |
230224
mv im ../../
231225
cd ../../im
232-
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
226+
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ env.itk-wheel-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
233227
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
234228
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
235229
7z x doxygen-1.8.11.windows.bin.zip -o/c/P/doxygen -aoa -r
@@ -241,7 +235,7 @@ jobs:
241235
run: |
242236
cd ../../im
243237
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
244-
set PATH="C:\P\grep;%PATH%"
238+
set PATH=C:\P\grep;%PATH%
245239
set CC=cl.exe
246240
set CXX=cl.exe
247241
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
@@ -257,7 +251,7 @@ jobs:
257251
- build-linux-python-packages
258252
- build-macos-python-packages
259253
- build-windows-python-packages
260-
runs-on: ubuntu-18.04
254+
runs-on: ubuntu-20.04
261255

262256
steps:
263257
- name: Download Python Packages

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-minimalpathextraction',
16-
version='1.2.0',
16+
version='1.2.1',
1717
author='Insight Software Consortium',
1818
author_email='[email protected]',
1919
packages=['itk'],
@@ -49,6 +49,6 @@
4949
keywords='ITK InsightToolkit',
5050
url=r'https://github.com/InsightSoftwareConsortium/ITKMinimalPathExtraction',
5151
install_requires=[
52-
r'itk>=5.2.0.post2'
52+
r'itk>=5.3rc4'
5353
]
5454
)

0 commit comments

Comments
 (0)