Skip to content

Commit 722b8b1

Browse files
committed
ENH: Update manylinux image to dockcross/manylinux_2_28-x64:20220705-b1eb184
1 parent e0ee330 commit 722b8b1

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
# scripts/dockcross-manylinux-build-module-wheels.sh cp39
1818
#
1919

20-
MANYLINUX_VERSION=_2_24
21-
IMAGE_TAG=20220622-343dde5
20+
MANYLINUX_VERSION=_2_28
21+
IMAGE_TAG=20220705-b1eb184
2222

2323
# Generate dockcross scripts
2424
docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64

scripts/dockcross-manylinux-build-wheels.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#
88
# scripts/dockcross-manylinux-build-wheels.sh cp39
99

10-
MANYLINUX_VERSION=_2_24
11-
IMAGE_TAG=20220622-343dde5
10+
MANYLINUX_VERSION=_2_28
11+
IMAGE_TAG=20220705-b1eb184
1212

1313
# Generate dockcross scripts
1414
docker run --rm dockcross/manylinux${MANYLINUX_VERSION}-x64:${IMAGE_TAG} > /tmp/dockcross-manylinux-x64

scripts/internal/manylinux-build-common.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
set -e -x
55

66
script_dir=$(cd $(dirname $0) || exit 1; pwd)
7-
# Workaround broken FindPython3 in CMake 3.17
8-
if test -e /usr/share/cmake-3.17/Modules/FindPython/Support.cmake; then
9-
sudo cp ${script_dir}/Support.cmake /usr/share/cmake-3.17/Modules/FindPython/
10-
fi
117

128
# Versions can be restricted by passing them in as arguments to the script
139
# For example,
@@ -44,7 +40,7 @@ case $(uname -m) in
4440
esac
4541

4642
# Install prerequirements
47-
export PATH=/work/tools/doxygen-1.8.11/bin:$PATH
43+
export PATH=/work/tools/doxygen-1.8.16/bin:$PATH
4844
case $(uname -m) in
4945
i686)
5046
ARCH=x86
@@ -53,8 +49,8 @@ case $(uname -m) in
5349
if ! type doxygen > /dev/null 2>&1; then
5450
mkdir -p /work/tools
5551
pushd /work/tools > /dev/null 2>&1
56-
curl https://data.kitware.com/api/v1/file/5c0aa4b18d777f2179dd0a71/download -o doxygen-1.8.11.linux.bin.tar.gz
57-
tar -xvzf doxygen-1.8.11.linux.bin.tar.gz
52+
curl https://data.kitware.com/api/v1/file/62c4d615bddec9d0c46cb705/download -o doxygen-1.8.16.linux.bin.tar.gz
53+
tar -xvzf doxygen-1.8.16.linux.bin.tar.gz
5854
popd > /dev/null 2>&1
5955
fi
6056
;;
@@ -63,8 +59,8 @@ case $(uname -m) in
6359
if ! type doxygen > /dev/null 2>&1; then
6460
mkdir -p /work/tools
6561
pushd /work/tools > /dev/null 2>&1
66-
curl https://data.kitware.com/api/v1/file/6086e4b02fa25629b93ac66e/download -o doxygen-1.8.11.linux.aarch64.bin.tar.gz
67-
tar -xvzf doxygen-1.8.11.linux.aarch64.bin.tar.gz
62+
curl https://data.kitware.com/api/v1/file/62c4ed58bddec9d0c46f1388/download -o doxygen-1.8.16.linux.aarch64.bin.tar.gz
63+
tar -xvzf doxygen-1.8.16.linux.aarch64.bin.tar.gz
6864
popd > /dev/null 2>&1
6965
fi
7066
;;
@@ -84,6 +80,6 @@ if ! type ninja > /dev/null 2>&1; then
8480
popd
8581
fi
8682

87-
MANYLINUX_VERSION=_2_24
83+
MANYLINUX_VERSION=_2_28
8884

8985
echo "Building wheels for $ARCH using manylinux${MANYLINUX_VERSION}"

0 commit comments

Comments
 (0)