Skip to content

Commit 76f4400

Browse files
committed
linux: manylinux1 -> manylinux2014
1 parent 29bff36 commit 76f4400

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

docs/Build_ITK_Python_packages.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ For example::
3232
[...]
3333

3434
$ ls -1 dist/
35-
itk-4.11.0.dev20170218-cp27-cp27m-manylinux1_x86_64.whl
36-
itk-4.11.0.dev20170218-cp27-cp27mu-manylinux1_x86_64.whl
37-
itk-4.11.0.dev20170218-cp34-cp34m-manylinux1_x86_64.whl
38-
itk-4.11.0.dev20170218-cp35-cp35m-manylinux1_x86_64.whl
39-
itk-4.11.0.dev20170218-cp36-cp36m-manylinux1_x86_64.whl
35+
itk-4.11.0.dev20170218-cp27-cp27m-manylinux2014_x86_64.whl
36+
itk-4.11.0.dev20170218-cp27-cp27mu-manylinux2014_x86_64.whl
37+
itk-4.11.0.dev20170218-cp34-cp34m-manylinux2014_x86_64.whl
38+
itk-4.11.0.dev20170218-cp35-cp35m-manylinux2014_x86_64.whl
39+
itk-4.11.0.dev20170218-cp36-cp36m-manylinux2014_x86_64.whl
4040

4141
macOS
4242
-----

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# scripts/dockcross-manylinux-build-module-wheels.sh cp39
1010

1111
# Generate dockcross scripts
12-
docker run --rm dockcross/manylinux1-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
12+
docker run --rm dockcross/manylinux2014-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
1313
chmod u+x /tmp/dockcross-manylinux-x64
1414

1515
script_dir=$(cd $(dirname $0) || exit 1; pwd)

scripts/dockcross-manylinux-build-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# scripts/dockcross-manylinux-build-wheels.sh cp35
99

1010
# Generate dockcross scripts
11-
docker run --rm dockcross/manylinux1-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
11+
docker run --rm dockcross/manylinux2014-x64:20201015-96d8741 > /tmp/dockcross-manylinux-x64
1212
chmod u+x /tmp/dockcross-manylinux-x64
1313

1414
script_dir=$(cd $(dirname $0) || exit 1; pwd)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ for PYBIN in "${PYBINARIES[@]}"; do
2525
version=$(basename $(dirname ${PYBIN}))
2626
# Remove "m" -- not present in Python 3.8 and later
2727
version=${version:0:9}
28-
itk_build_dir=/work/$(basename /ITKPythonPackage/ITK-${version}*-manylinux1_${ARCH})
29-
ln -fs /ITKPythonPackage/ITK-${version}*-manylinux1_${ARCH} $itk_build_dir
28+
itk_build_dir=/work/$(basename /ITKPythonPackage/ITK-${version}*-manylinux2014_${ARCH})
29+
ln -fs /ITKPythonPackage/ITK-${version}*-manylinux2014_${ARCH} $itk_build_dir
3030
if [[ ! -d ${itk_build_dir} ]]; then
3131
echo 'ITK build tree not available!' 1>&2
3232
exit 1
@@ -51,7 +51,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
5151
done
5252

5353
# Since there are no external shared libraries to bundle into the wheels
54-
# this step will fixup the wheel switching from 'linux' to 'manylinux1' tag
54+
# this step will fixup the wheel switching from 'linux' to 'manylinux2014' tag
5555
for whl in dist/*linux_$(uname -p).whl; do
5656
auditwheel repair ${whl} -w /work/dist/
5757
rm ${whl}

scripts/internal/manylinux-build-wheels.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ for PYBIN in "${PYBINARIES[@]}"; do
4141
build_type="Release"
4242
compile_flags="-O3 -DNDEBUG"
4343
source_path=/work/ITK-source/ITK
44-
build_path=/work/ITK-$(basename $(dirname ${PYBIN}))-manylinux1_${ARCH}
44+
build_path=/work/ITK-$(basename $(dirname ${PYBIN}))-manylinux2014_${ARCH}
4545
SETUP_PY_CONFIGURE="${script_dir}/../setup_py_configure.py"
4646
SKBUILD_CMAKE_INSTALL_PREFIX=$(${Python3_EXECUTABLE} -c "from skbuild.constants import CMAKE_INSTALL_DIR; print(CMAKE_INSTALL_DIR)")
4747

@@ -146,14 +146,15 @@ for PYBIN in "${PYBINARIES[@]}"; do
146146

147147
done
148148

149-
# auditwheel contains a regression where it will consume the "itk" wheels.
150-
/opt/python/cp37-cp37m/bin/pip3 install auditwheel==1.9.0 wheel==0.26.0
149+
/opt/python/cp37-cp37m/bin/pip3 install auditwheel wheel
151150
# Since there are no external shared libraries to bundle into the wheels
152-
# this step will fixup the wheel switching from 'linux' to 'manylinux1' tag
153-
for whl in dist/*linux_$(uname -p).whl; do
154-
/opt/python/cp37-cp37m/bin/auditwheel repair ${whl} -w /work/dist/
151+
# this step will fixup the wheel switching from 'linux' to 'manylinux2014' tag
152+
for whl in dist/itk_*linux_$(uname -p).whl; do
153+
/opt/python/cp37-cp37m/bin/auditwheel repair --plat manylinux2014_x86_64 ${whl} -w /work/dist/
155154
rm ${whl}
156155
done
156+
itk_wheel=$(ls dist/itk-*linux*)
157+
mv ${itk_wheel} ${itk_wheel/linux/manylinux2014}
157158

158159
# Install packages and test
159160
for PYBIN in "${PYBINARIES[@]}"; do

0 commit comments

Comments
 (0)