Skip to content

Commit e42b5be

Browse files
hjmjohnsonhjmjohnson
committed
ENH: Update cookie cutter package versions
Update various package versions to match the recent minimums and recommendations.
1 parent b68fb67 commit e42b5be

File tree

6 files changed

+251
-80
lines changed

6 files changed

+251
-80
lines changed

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

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ on:
99
- main
1010

1111
env:
12-
# v5.4.0 + additional patches on the release-5.4 branch
13-
itk-git-tag: "49413c3a9e8ecf0f912534e7c13f4c7bc3799d60"
14-
itk-wheel-tag: "v5.4.0"
15-
# v5.4.0 + fixes
16-
itk-python-package-tag: "830d14cc40199f438001ee493288139fb75bba92"
12+
# v6.0a02
13+
itk-git-tag: "v6.0a02"
14+
itk-wheel-tag: "v6.0a02"
15+
# v6.0a02 + fixes
16+
itk-python-package-tag: "v6.0a02"
1717
itk-python-package-org: "InsightSoftwareConsortium"
1818

1919
jobs:
@@ -22,9 +22,10 @@ jobs:
2222
strategy:
2323
max-parallel: 3
2424
matrix:
25-
os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
25+
# runners macos-13 is x86_64, macos-15 is arm64 by default
26+
os: [ubuntu-24.04, windows-2022, macos-13, macos-15]
2627
include:
27-
- os: ubuntu-22.04
28+
- os: ubuntu-24.04
2829
c-compiler: "gcc"
2930
cxx-compiler: "g++"
3031
cmake-build-type: "MinSizeRel"
@@ -36,22 +37,24 @@ jobs:
3637
c-compiler: "clang"
3738
cxx-compiler: "clang++"
3839
cmake-build-type: "MinSizeRel"
39-
- os: macos-14
40+
deployment_target: '10.9'
41+
- os: macos-15
4042
c-compiler: "clang"
4143
cxx-compiler: "clang++"
4244
cmake-build-type: "MinSizeRel"
45+
deployment_target: '13.0'
4346

4447
steps:
45-
- uses: actions/checkout@v4
48+
- uses: actions/checkout@v4.2.2
4649

4750
- name: Free Disk Space (Ubuntu)
48-
if: matrix.os == 'ubuntu-22.04'
51+
if: matrix.os == 'ubuntu-24.04'
4952
uses: jlumbroso/[email protected]
5053
with:
5154
large-packages: false
5255

5356
- name: Set up Python 3.11
54-
uses: actions/setup-python@v5
57+
uses: actions/setup-python@v5.4.0
5558
with:
5659
python-version: "3.11"
5760

@@ -62,17 +65,17 @@ jobs:
6265
python -m pip install cookiecutter
6366
6467
- name: Get specific version of CMake, Ninja
65-
uses: lukka/get-cmake@v3.29.0
68+
uses: lukka/get-cmake@v3.31.5
6669

67-
- name: 'Specific XCode version'
70+
- name: 'Specific XCode version 14.3.1'
6871
if: matrix.os == 'macos-13'
6972
run: |
7073
sudo xcode-select -s "/Applications/Xcode_14.3.1.app"
7174
72-
- name: 'Specific XCode version'
73-
if: matrix.os == 'macos-14'
75+
- name: 'Specific XCode version 16.2'
76+
if: matrix.os == 'macos-15'
7477
run: |
75-
sudo xcode-select -s "/Applications/Xcode_15.0.1.app"
78+
sudo xcode-select -s "/Applications/Xcode_16.2.app"
7679
7780
- name: Download ITK
7881
run: |
@@ -170,14 +173,14 @@ jobs:
170173
ctest --output-on-failure -j 2 -V -S dashboard.cmake
171174
172175
build-linux-python-packages:
173-
runs-on: ubuntu-22.04
176+
runs-on: ubuntu-24.04
174177
strategy:
175178
max-parallel: 2
176179
matrix:
177-
python-version: ["39", "310", "311"]
180+
python-version: ["39", "310", "311","312","313"]
178181

179182
steps:
180-
- uses: actions/checkout@v4
183+
- uses: actions/checkout@v4.2.2
181184

182185
- name: 'Free up disk space'
183186
run: |
@@ -195,12 +198,12 @@ jobs:
195198
unzstd --version
196199
197200
- name: Set up Python 3.11
198-
uses: actions/setup-python@v5
201+
uses: actions/setup-python@v5.4.0
199202
with:
200203
python-version: "3.11"
201204

202205
- name: Get specific version of CMake, Ninja
203-
uses: lukka/get-cmake@v3.29.0
206+
uses: lukka/get-cmake@v3.31.5
204207

205208
- name: Evaluate template
206209
shell: bash
@@ -227,7 +230,7 @@ jobs:
227230
done
228231
229232
- name: Publish Python package as GitHub Artifact
230-
uses: actions/upload-artifact@v4
233+
uses: actions/upload-artifact@v4.6.0
231234
with:
232235
name: LinuxWheel3${{ matrix.python-version }}
233236
path: Evaluated/ITKModuleTemplate/dist
@@ -237,25 +240,25 @@ jobs:
237240
strategy:
238241
max-parallel: 2
239242
matrix:
240-
python3-minor-version: ["9", "10", "11"]
243+
python3-minor-version: ["9", "10", "11", "12", "13"]
241244

242245
steps:
243-
- uses: actions/checkout@v4
246+
- uses: actions/checkout@v4.2.2
244247

245248
- name: 'Specific XCode version'
246249
run: |
247250
sudo xcode-select -s "/Applications/Xcode_14.3.1.app"
248251
249252
- name: Get specific version of CMake, Ninja
250-
uses: lukka/get-cmake@v3.29.0
253+
uses: lukka/get-cmake@v3.31.5
251254

252255
- name: 'Fetch build script'
253256
run: |
254257
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/${{ env.itk-python-package-tag }}/scripts/macpython-download-cache-and-build-module-wheels.sh -O
255258
chmod u+x macpython-download-cache-and-build-module-wheels.sh
256259
257260
- name: Set up Python 3.11
258-
uses: actions/setup-python@v5
261+
uses: actions/setup-python@v5.4.0
259262
with:
260263
python-version: "3.11"
261264

@@ -272,11 +275,12 @@ jobs:
272275
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
273276
export ITKPYTHONPACKAGE_TAG=${{ env.itk-python-package-tag }}
274277
export ITKPYTHONPACKAGE_ORG=${{ env.itk-python-package-org }}
275-
export MACOSX_DEPLOYMENT_TARGET=10.9
278+
# For Xcode 16.2, the recommended "MACOSX_DEPLOYMENT_TARGET" is "13.0"; this means your application should be built to run on macOS Ventura (version 13.0) or later.
279+
export MACOSX_DEPLOYMENT_TARGET=${{ matrix.deployment_target || '13.0' }}
276280
../../macpython-download-cache-and-build-module-wheels.sh "3.${{ matrix.python3-minor-version }}"
277281
278282
- name: Publish Python package as GitHub Artifact
279-
uses: actions/upload-artifact@v4
283+
uses: actions/upload-artifact@v4.6.0
280284
with:
281285
name: MacOSWheel3${{ matrix.python3-minor-version }}
282286
path: Evaluated/ITKModuleTemplate/dist
@@ -289,23 +293,23 @@ jobs:
289293
python-version-minor: ["9", "10", "11"]
290294

291295
steps:
292-
- uses: actions/checkout@v4
296+
- uses: actions/checkout@v4.2.2
293297

294298
- name: 'Install Python'
295299
run: |
296300
$pythonArch = "64"
297301
$pythonVersion = "3.${{ matrix.python-version-minor }}"
298302
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/scikit-build/scikit-ci-addons/master/windows/install-python.ps1'))
299303
300-
- uses: actions/setup-python@v5
304+
- uses: actions/setup-python@v5.4.0
301305
with:
302306
python-version: '3.x'
303307

304308
- name: Get specific version of CMake, Ninja
305-
uses: lukka/get-cmake@v3.29.0
309+
uses: lukka/get-cmake@v3.31.5
306310

307-
- name: Set up Python 3.11
308-
uses: actions/setup-python@v5
311+
- name: Set up Python 3.11/
312+
uses: actions/setup-python@v5.4.0
309313
with:
310314
python-version: "3.11"
311315

@@ -347,7 +351,7 @@ jobs:
347351
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"
348352
349353
- name: Publish Python package as GitHub Artifact
350-
uses: actions/upload-artifact@v4
354+
uses: actions/upload-artifact@v4.6.0
351355
with:
352356
name: WindowsWheel3.${{ matrix.python-version-minor }}
353357
path: Evaluated/ITKModuleTemplate/dist

‎.github/workflows/clang-format-linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v4.2.2
1111

1212
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master

0 commit comments

Comments
 (0)