From 632a791e673aa5e61b9e6a9b0280ab9d9e79beba Mon Sep 17 00:00:00 2001 From: sanchda <838104+sanchda@users.noreply.github.com> Date: Mon, 1 Jul 2024 22:48:47 +0000 Subject: [PATCH 1/7] attempt --- .github/workflows/build_python_3.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_python_3.yml b/.github/workflows/build_python_3.yml index eb3d0e21863..bf9237918d2 100644 --- a/.github/workflows/build_python_3.yml +++ b/.github/workflows/build_python_3.yml @@ -60,7 +60,7 @@ jobs: - name: Build wheels arm64 if: matrix.os == 'arm-4core-linux' - run: /home/runner/.local/bin/pipx run cibuildwheel==2.16.5 --platform linux + run: /home/runner/.local/bin/pipx run cibuildwheel==2.19.1 --platform linux env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones @@ -80,11 +80,7 @@ jobs: CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH" CIBW_REPAIR_WHEEL_COMMAND_LINUX: | mkdir ./tempwheelhouse && - unzip -l {wheel} | grep '\.so' && - auditwheel repair -w ./tempwheelhouse {wheel} && - (yum install -y zip || apk add zip) && for w in ./tempwheelhouse/*.whl; do - zip -d $w \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx mv $w {dest_dir} done && rm -rf ./tempwheelhouse @@ -100,7 +96,7 @@ jobs: - name: Build wheels if: matrix.os != 'arm-4core-linux' - uses: pypa/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.19.1 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones @@ -120,11 +116,7 @@ jobs: CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH" CIBW_REPAIR_WHEEL_COMMAND_LINUX: | mkdir ./tempwheelhouse && - unzip -l {wheel} | grep '\.so' && - auditwheel repair -w ./tempwheelhouse {wheel} && - (yum install -y zip || apk add zip) && for w in ./tempwheelhouse/*.whl; do - zip -d $w \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx mv $w {dest_dir} done && rm -rf ./tempwheelhouse From 2d1a19eae2098b383e48a9b7451aeda3601fa35a Mon Sep 17 00:00:00 2001 From: sanchda <838104+sanchda@users.noreply.github.com> Date: Mon, 1 Jul 2024 22:57:39 +0000 Subject: [PATCH 2/7] Revert "attempt" This reverts commit 632a791e673aa5e61b9e6a9b0280ab9d9e79beba. --- .github/workflows/build_python_3.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_python_3.yml b/.github/workflows/build_python_3.yml index bf9237918d2..eb3d0e21863 100644 --- a/.github/workflows/build_python_3.yml +++ b/.github/workflows/build_python_3.yml @@ -60,7 +60,7 @@ jobs: - name: Build wheels arm64 if: matrix.os == 'arm-4core-linux' - run: /home/runner/.local/bin/pipx run cibuildwheel==2.19.1 --platform linux + run: /home/runner/.local/bin/pipx run cibuildwheel==2.16.5 --platform linux env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones @@ -80,7 +80,11 @@ jobs: CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH" CIBW_REPAIR_WHEEL_COMMAND_LINUX: | mkdir ./tempwheelhouse && + unzip -l {wheel} | grep '\.so' && + auditwheel repair -w ./tempwheelhouse {wheel} && + (yum install -y zip || apk add zip) && for w in ./tempwheelhouse/*.whl; do + zip -d $w \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx mv $w {dest_dir} done && rm -rf ./tempwheelhouse @@ -96,7 +100,7 @@ jobs: - name: Build wheels if: matrix.os != 'arm-4core-linux' - uses: pypa/cibuildwheel@v2.19.1 + uses: pypa/cibuildwheel@v2.16.5 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones @@ -116,7 +120,11 @@ jobs: CIBW_ENVIRONMENT_LINUX: "PATH=$HOME/.cargo/bin:$PATH" CIBW_REPAIR_WHEEL_COMMAND_LINUX: | mkdir ./tempwheelhouse && + unzip -l {wheel} | grep '\.so' && + auditwheel repair -w ./tempwheelhouse {wheel} && + (yum install -y zip || apk add zip) && for w in ./tempwheelhouse/*.whl; do + zip -d $w \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx mv $w {dest_dir} done && rm -rf ./tempwheelhouse From 6c9709400d7e09a1044ba161f6a8974576e32352 Mon Sep 17 00:00:00 2001 From: sanchda <838104+sanchda@users.noreply.github.com> Date: Mon, 1 Jul 2024 23:08:58 +0000 Subject: [PATCH 3/7] Update macos deployment target --- .github/workflows/build_python_3.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_python_3.yml b/.github/workflows/build_python_3.yml index eb3d0e21863..8ff71a025d1 100644 --- a/.github/workflows/build_python_3.yml +++ b/.github/workflows/build_python_3.yml @@ -60,7 +60,7 @@ jobs: - name: Build wheels arm64 if: matrix.os == 'arm-4core-linux' - run: /home/runner/.local/bin/pipx run cibuildwheel==2.16.5 --platform linux + run: /home/runner/.local/bin/pipx run cibuildwheel==2.19.1 --platform linux env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones @@ -88,6 +88,7 @@ jobs: mv $w {dest_dir} done && rm -rf ./tempwheelhouse + CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=11.7" CIBW_REPAIR_WHEEL_COMMAND_MACOS: | zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} @@ -100,7 +101,7 @@ jobs: - name: Build wheels if: matrix.os != 'arm-4core-linux' - uses: pypa/cibuildwheel@v2.16.5 + uses: pypa/cibuildwheel@v2.19.1 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones @@ -128,6 +129,7 @@ jobs: mv $w {dest_dir} done && rm -rf ./tempwheelhouse + CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=11.7" CIBW_REPAIR_WHEEL_COMMAND_MACOS: | zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} From 6bdd04948a3069b6caf27fc31cfec0ccf1e97714 Mon Sep 17 00:00:00 2001 From: Federico Mon Date: Tue, 2 Jul 2024 16:08:21 +0200 Subject: [PATCH 4/7] bump to 2.19.2 --- .github/workflows/build_python_3.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_python_3.yml b/.github/workflows/build_python_3.yml index 8ff71a025d1..1dffee3412f 100644 --- a/.github/workflows/build_python_3.yml +++ b/.github/workflows/build_python_3.yml @@ -60,7 +60,7 @@ jobs: - name: Build wheels arm64 if: matrix.os == 'arm-4core-linux' - run: /home/runner/.local/bin/pipx run cibuildwheel==2.19.1 --platform linux + run: /home/runner/.local/bin/pipx run cibuildwheel==2.19.2 --platform linux env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones @@ -101,7 +101,7 @@ jobs: - name: Build wheels if: matrix.os != 'arm-4core-linux' - uses: pypa/cibuildwheel@v2.19.1 + uses: pypa/cibuildwheel@v2.19.2 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones From 470d6392261d309d9e074900caf11d6bb6c4c237 Mon Sep 17 00:00:00 2001 From: Federico Mon Date: Tue, 2 Jul 2024 16:17:41 +0200 Subject: [PATCH 5/7] remove macos deployment target --- .github/workflows/build_python_3.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build_python_3.yml b/.github/workflows/build_python_3.yml index 437f363052a..66e54d387c3 100644 --- a/.github/workflows/build_python_3.yml +++ b/.github/workflows/build_python_3.yml @@ -87,7 +87,6 @@ jobs: mv $w {dest_dir} done && rm -rf ./tempwheelhouse - CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=11.7" CIBW_REPAIR_WHEEL_COMMAND_MACOS: | zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} @@ -127,7 +126,6 @@ jobs: mv $w {dest_dir} done && rm -rf ./tempwheelhouse - CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=11.7" CIBW_REPAIR_WHEEL_COMMAND_MACOS: | zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} From 362dfd927874ec9582c6c4aecd554197fcc784bb Mon Sep 17 00:00:00 2001 From: Federico Mon Date: Tue, 2 Jul 2024 16:28:03 +0200 Subject: [PATCH 6/7] Revert "remove macos deployment target" This reverts commit 470d6392261d309d9e074900caf11d6bb6c4c237. --- .github/workflows/build_python_3.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_python_3.yml b/.github/workflows/build_python_3.yml index 66e54d387c3..437f363052a 100644 --- a/.github/workflows/build_python_3.yml +++ b/.github/workflows/build_python_3.yml @@ -87,6 +87,7 @@ jobs: mv $w {dest_dir} done && rm -rf ./tempwheelhouse + CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=11.7" CIBW_REPAIR_WHEEL_COMMAND_MACOS: | zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} @@ -126,6 +127,7 @@ jobs: mv $w {dest_dir} done && rm -rf ./tempwheelhouse + CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=11.7" CIBW_REPAIR_WHEEL_COMMAND_MACOS: | zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} From 8313b061ea827c0aea80bdb681d150abfe868142 Mon Sep 17 00:00:00 2001 From: Federico Mon Date: Tue, 2 Jul 2024 16:28:45 +0200 Subject: [PATCH 7/7] bump macos deployment target --- .github/workflows/build_python_3.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_python_3.yml b/.github/workflows/build_python_3.yml index 437f363052a..8a6c0ae01c3 100644 --- a/.github/workflows/build_python_3.yml +++ b/.github/workflows/build_python_3.yml @@ -87,7 +87,7 @@ jobs: mv $w {dest_dir} done && rm -rf ./tempwheelhouse - CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=11.7" + CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=12" CIBW_REPAIR_WHEEL_COMMAND_MACOS: | zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel} @@ -127,7 +127,7 @@ jobs: mv $w {dest_dir} done && rm -rf ./tempwheelhouse - CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=11.7" + CIBW_ENVIRONMENT_MACOS: "MACOSX_DEPLOYMENT_TARGET=12" CIBW_REPAIR_WHEEL_COMMAND_MACOS: | zip -d {wheel} \*.c \*.cpp \*.cc \*.h \*.hpp \*.pyx && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}