From 8ac357aae1ee49d801232d0958a5d266a012edf6 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:17:15 +0100 Subject: [PATCH 01/11] Use manylinux2010 for Linux wheels --- .github/workflows/buildwheel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index 05630625..0ee7fa4e 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -37,8 +37,8 @@ jobs: CIBW_BUILD: cp39-* cp310-* cp311-* CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux_*" #CIBW_SKIP: "*-win32 *-musllinux_*" - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 - CIBW_MANYLINUX_I686_IMAGE: manylinux2014 + CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010 + CIBW_MANYLINUX_I686_IMAGE: manylinux2010 CIBW_BEFORE_ALL_LINUX: bin/cibw_before_all_linux.sh CIBW_BEFORE_ALL_MACOS: bin/cibw_before_all_macosx_x86_64.sh CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh From 27119a0f01c76efe00e92ccd5e57f8d69a84dd65 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:17:54 +0100 Subject: [PATCH 02/11] Only build Linux wheels (faster) --- .github/workflows/buildwheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index 0ee7fa4e..2b60254e 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019, macos-12] + os: [ubuntu-20.04] steps: - uses: actions/checkout@v3 From af2e7d4c92ffbb999c0d3968dff8d573e2a65b43 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:18:40 +0100 Subject: [PATCH 03/11] Only test Linux wheels --- .github/workflows/buildwheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index 2b60254e..5b97c2f7 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -64,7 +64,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019, macos-12] + os: [ubuntu-20.04] python-version: ['3.9', '3.10', '3.11'] steps: From 3a57f96b42d12d814753edf37c0e74313eca4730 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:20:20 +0100 Subject: [PATCH 04/11] Try manylinux_2_17 --- .github/workflows/buildwheel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index 5b97c2f7..e24015fa 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -37,8 +37,8 @@ jobs: CIBW_BUILD: cp39-* cp310-* cp311-* CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux_*" #CIBW_SKIP: "*-win32 *-musllinux_*" - CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010 - CIBW_MANYLINUX_I686_IMAGE: manylinux2010 + CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_17 + CIBW_MANYLINUX_I686_IMAGE: manylinux_2_17 CIBW_BEFORE_ALL_LINUX: bin/cibw_before_all_linux.sh CIBW_BEFORE_ALL_MACOS: bin/cibw_before_all_macosx_x86_64.sh CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh From 57ff92d6f25e05614040ba0fa0b266bd73bfa9d4 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:26:29 +0100 Subject: [PATCH 05/11] Use manylinux_2_24 --- .github/workflows/buildwheel.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index e24015fa..618f2e35 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -37,8 +37,8 @@ jobs: CIBW_BUILD: cp39-* cp310-* cp311-* CIBW_SKIP: "*-win32 *-manylinux_i686 *-musllinux_*" #CIBW_SKIP: "*-win32 *-musllinux_*" - CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_17 - CIBW_MANYLINUX_I686_IMAGE: manylinux_2_17 + CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_24 + CIBW_MANYLINUX_I686_IMAGE: manylinux_2_24 CIBW_BEFORE_ALL_LINUX: bin/cibw_before_all_linux.sh CIBW_BEFORE_ALL_MACOS: bin/cibw_before_all_macosx_x86_64.sh CIBW_BEFORE_ALL_WINDOWS: msys2 -c bin/cibw_before_all_windows.sh From 22d7888da6bed3adf9ee0ef865ec2be39c22a9e0 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:28:58 +0100 Subject: [PATCH 06/11] Skip installing xz... --- bin/cibw_before_all_linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cibw_before_all_linux.sh b/bin/cibw_before_all_linux.sh index 405d89dc..6da0370e 100755 --- a/bin/cibw_before_all_linux.sh +++ b/bin/cibw_before_all_linux.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -yum install -y xz +#yum install -y xz bin/build_dependencies_unix.sh\ --gmp gmp\ --host x86_64-pc-linux-gnu\ From acc2aef866e6f1bd16f5d4c67d529e80c7586556 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:36:17 +0100 Subject: [PATCH 07/11] apt-get install xz-utils --- bin/cibw_before_all_linux.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/cibw_before_all_linux.sh b/bin/cibw_before_all_linux.sh index 6da0370e..047ae8bc 100755 --- a/bin/cibw_before_all_linux.sh +++ b/bin/cibw_before_all_linux.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash #yum install -y xz +apt-get install -y xz-utils + bin/build_dependencies_unix.sh\ --gmp gmp\ --host x86_64-pc-linux-gnu\ From 5cc73ce6cf09264e35db78775f0de31d8ae4c9fa Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:41:23 +0100 Subject: [PATCH 08/11] apt-get update --- bin/cibw_before_all_linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/cibw_before_all_linux.sh b/bin/cibw_before_all_linux.sh index 047ae8bc..525cfb99 100755 --- a/bin/cibw_before_all_linux.sh +++ b/bin/cibw_before_all_linux.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash #yum install -y xz +apt-get update apt-get install -y xz-utils bin/build_dependencies_unix.sh\ From e9fe9ac61addb7335759ce4088d61f4fa18b3d97 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:48:46 +0100 Subject: [PATCH 09/11] try sudo? --- bin/cibw_before_all_linux.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/cibw_before_all_linux.sh b/bin/cibw_before_all_linux.sh index 525cfb99..9133cbfa 100755 --- a/bin/cibw_before_all_linux.sh +++ b/bin/cibw_before_all_linux.sh @@ -1,8 +1,10 @@ #!/usr/bin/env bash +set -xe + #yum install -y xz -apt-get update -apt-get install -y xz-utils +sudo apt-get update +sudo apt-get install -y xz-utils bin/build_dependencies_unix.sh\ --gmp gmp\ From 2ba5d26fb2eb7f84fd9c891e00eb5f389e222065 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 11:50:45 +0100 Subject: [PATCH 10/11] not sudo! --- bin/cibw_before_all_linux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/cibw_before_all_linux.sh b/bin/cibw_before_all_linux.sh index 9133cbfa..b635b1e2 100755 --- a/bin/cibw_before_all_linux.sh +++ b/bin/cibw_before_all_linux.sh @@ -3,8 +3,8 @@ set -xe #yum install -y xz -sudo apt-get update -sudo apt-get install -y xz-utils +apt-get update +apt-get install -y xz-utils bin/build_dependencies_unix.sh\ --gmp gmp\ From 6bd3232e5b9a0a41058ad793ba3fade830fb7528 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Wed, 9 Aug 2023 12:08:01 +0100 Subject: [PATCH 11/11] manually modify sources.list --- bin/cibw_before_all_linux.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/cibw_before_all_linux.sh b/bin/cibw_before_all_linux.sh index b635b1e2..c8a67db5 100755 --- a/bin/cibw_before_all_linux.sh +++ b/bin/cibw_before_all_linux.sh @@ -3,6 +3,11 @@ set -xe #yum install -y xz + +# The echo lines are needed for manylinux_2_24 +# https://github.com/pypa/manylinux/issues/1369#issuecomment-1546594841 +echo "deb http://archive.debian.org/debian stretch main" > /etc/apt/sources.list +echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list apt-get update apt-get install -y xz-utils