Skip to content

Commit 58210dd

Browse files
authored
Merge pull request #145 from InsightSoftwareConsortium/bump-itk-workflow
ENH: Bump for ITK v5.3
2 parents 528f5c7 + 664dc2d commit 58210dd

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on: [push,pull_request]
55
env:
66
itk-git-tag: "v5.3.0"
77
itk-wheel-tag: "v5.3.0"
8+
itk-python-package-tag: "03391ad738438661fff40bfe37a7cfabd171b9b1"
89

910
jobs:
1011
build-test-cxx:
@@ -179,16 +180,18 @@ jobs:
179180
180181
- name: 'Fetch build script'
181182
run: |
182-
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O
183+
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/${{ env.itk-python-package-tag }}/scripts/dockcross-manylinux-download-cache-and-build-module-wheels.sh -O
183184
chmod u+x dockcross-manylinux-download-cache-and-build-module-wheels.sh
184185
185186
- name: 'Build 🐍 Python 📦 package'
186187
run: |
187188
cd "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate"
188189
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
189-
for tarball in "-manylinux_2_28" "-manylinux2014"; do
190+
export ITKPYTHONPACKAGE_TAG=${{ env.itk-python-package-tag }}
191+
for manylinux_version in "_2_28" "2014"; do
190192
rm -rf ITKPythonPackage
191-
export TARBALL_SPECIALIZATION=${tarball}
193+
export MANYLINUX_VERSION=${manylinux_version}
194+
echo "Building for manylinux specialization ${MANYLINUX_VERSION}"
192195
../../dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
193196
done
194197
@@ -215,7 +218,7 @@ jobs:
215218

216219
- name: 'Fetch build script'
217220
run: |
218-
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/macpython-download-cache-and-build-module-wheels.sh -O
221+
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/${{ env.itk-python-package-tag }}/scripts/macpython-download-cache-and-build-module-wheels.sh -O
219222
chmod u+x macpython-download-cache-and-build-module-wheels.sh
220223
221224
- name: Set up Python 3.8
@@ -234,6 +237,7 @@ jobs:
234237
run: |
235238
cd "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate"
236239
export ITK_PACKAGE_VERSION=${{ env.itk-wheel-tag }}
240+
export ITKPYTHONPACKAGE_TAG=${{ env.itk-python-package-tag }}
237241
export MACOSX_DEPLOYMENT_TARGET=10.9
238242
../../macpython-download-cache-and-build-module-wheels.sh
239243
@@ -290,12 +294,11 @@ jobs:
290294
7z x grep-win.zip -o/c/P/grep -aoa -r
291295
292296
# Update step for skbuild issue in v5.3.0 build archive
293-
ITK_PYTHON_PACKAGE_TAG=0f5effc39afbf7cb1ac5ab20faa0996ddb12b34d
294-
echo "Updating ITKPythonPackage build scripts to ${ITK_PYTHON_PACKAGE_TAG}"
297+
echo "Updating ITKPythonPackage build scripts to ${{ env.itk-python-package-tag }}"
295298
pushd /c/P/IPP
296299
git remote add InsightSoftwareConsortium https://github.com/InsightSoftwareConsortium/ITKPythonPackage.git --tags
297300
git fetch InsightSoftwareConsortium
298-
git checkout ${ITK_PYTHON_PACKAGE_TAG}
301+
git checkout ${{ env.itk-python-package-tag }}
299302
git status
300303
popd
301304

{{cookiecutter.project_name}}/.github/workflows/build-test-package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on: [push,pull_request]
44

55
jobs:
66
cxx-build-workflow:
7-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.3.0
7+
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@5083da2740617b78423ebf6083489e1e70ee8ca0
88

99
python-build-workflow:
10-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.3.0
10+
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@5083da2740617b78423ebf6083489e1e70ee8ca0
1111
secrets:
1212
pypi_password: ${{ "{{" }} secrets.pypi_password {{ "}}" }}

{{cookiecutter.project_name}}/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@
4343
keywords='ITK InsightToolkit',
4444
url=r'https://itk.org/',
4545
install_requires=[
46-
r'itk>=5.3rc04.post3'
46+
r'itk>=5.3.0'
4747
]
4848
)

0 commit comments

Comments
 (0)