Skip to content

Commit 46b9640

Browse files
committed
BUG: Fix manylinux wheel renaming on arm64
1 parent 7a82037 commit 46b9640

File tree

4 files changed

+30
-19
lines changed

4 files changed

+30
-19
lines changed

itk/__init__.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

scripts/internal/manylinux-build-module-wheels.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,18 @@ for PYBIN in "${PYBINARIES[@]}"; do
5050
${PYBIN}/python setup.py clean
5151
done
5252

53-
# Since there are no external shared libraries to bundle into the wheels
54-
# this step will fixup the wheel switching from 'linux' to 'manylinux2014' tag
55-
for whl in dist/*linux_$(uname -p).whl; do
53+
if test "${ARCH}" == "x64"; then
54+
for whl in dist/*linux_$(uname -p).whl; do
5655
auditwheel repair ${whl} -w /work/dist/
5756
rm ${whl}
57+
done
58+
# Since there are no external shared libraries to bundle into the wheels
59+
# this step will fixup the wheel switching from 'linux' to 'manylinux2014' tag
60+
for whl in dist/itk_*linux_$(uname -p).whl; do
61+
/opt/python/cp37-cp37m/bin/auditwheel repair --plat manylinux2014_x86_64 ${whl} -w /work/dist/
62+
rm ${whl}
63+
done
64+
fi
65+
for itk_wheel in dist/itk*-linux*.whl; do
66+
mv ${itk_wheel} ${itk_wheel/linux/manylinux2014}
5867
done

scripts/internal/manylinux-build-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ if test "${ARCH}" == "x64"; then
150150
rm ${whl}
151151
done
152152
fi
153-
for itk_wheel in dist/itk-*linux*.whl; do
153+
for itk_wheel in dist/itk*-linux*.whl; do
154154
mv ${itk_wheel} ${itk_wheel/linux/manylinux2014}
155155
done
156156

setup.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Generated using: python setup_py_configure.py 'itk'
2+
# Generated using: python setup_py_configure.py 'itk-meta'
33

44
from __future__ import print_function
55
from os import sys, path
@@ -16,14 +16,19 @@
1616
sys.path.append(path.dirname(path.dirname(path.abspath(__file__))))
1717
from itkVersion import get_versions
1818

19+
long_description = 'itk\n'
20+
long_description += '====================================\n\n'
21+
long_description += 'ITK is an open-source, cross-platform library that provides developers with an extensive suite of software tools for image analysis. Developed through extreme programming methodologies, ITK employs leading-edge algorithms for registering and segmenting multidimensional scientific images.\n\n'
22+
1923
this_directory = path.abspath(path.dirname(__file__))
2024
itk_readme_path = path.join(this_directory, 'ITK-source', 'ITK', 'README.md')
2125
if path.exists(itk_readme_path):
2226
with open(itk_readme_path, encoding='utf-8') as f:
23-
long_description = f.read()
27+
long_description += f.read()
2428
else:
2529
with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
26-
long_description = f.read()
30+
long_description += f.read()
31+
2732

2833
setup(
2934
name='itk',
@@ -32,17 +37,8 @@
3237
author_email='[email protected]',
3338
packages=['itk'],
3439
package_dir={'itk': 'itk'},
35-
cmake_args=[],
36-
py_modules=[
37-
'itkBase',
38-
'itkConfig',
39-
'itkExtras',
40-
'itkLazy',
41-
'itkTemplate',
42-
'itkTypes',
43-
'itkVersion',
44-
'itkBuildOptions'
45-
],
40+
cmake_args=['-DITKPythonPackage_WHEEL_NAME:STRING=itk-meta'],
41+
py_modules=[],
4642
download_url=r'https://itk.org/ITK/resources/software.html',
4743
description=r'ITK is an open-source toolkit for multidimensional image analysis',
4844
long_description=long_description,
@@ -70,5 +66,12 @@
7066
keywords='ITK InsightToolkit segmentation registration image imaging',
7167
url=r'https://itk.org/',
7268
install_requires=[
69+
'itk-core==5.2.0.post1',
70+
'itk-numerics==5.2.0.post1',
71+
'itk-io==5.2.0.post1',
72+
'itk-filtering==5.2.0.post1',
73+
'itk-registration==5.2.0.post1',
74+
'itk-segmentation==5.2.0.post1',
75+
'numpy'
7376
]
7477
)

0 commit comments

Comments
 (0)