From 8b00e94ed776ebbda5e1ee0cc519788e89204e8e Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 16 Jun 2025 11:49:44 +0200 Subject: [PATCH 1/5] Bump `cibuildwheel` to v2.21.1 This is the last version that doesn't yet have `armv7l`. --- .github/workflows/reusable-cibuildwheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reusable-cibuildwheel.yml b/.github/workflows/reusable-cibuildwheel.yml index df7fe468e..3104125e4 100644 --- a/.github/workflows/reusable-cibuildwheel.yml +++ b/.github/workflows/reusable-cibuildwheel.yml @@ -101,7 +101,7 @@ jobs: shell: bash - name: Build wheels - uses: pypa/cibuildwheel@v2.17.0 + uses: pypa/cibuildwheel@v2.21.1 env: # CIBW_ARCHS_MACOS: all x86_64 arm64 universal2 CIBW_ARCHS_MACOS: native From f4de1b095799352670809e2d1adf29dd509a8aa0 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 16 Jun 2025 12:04:29 +0200 Subject: [PATCH 2/5] Bump `packaging` pin to 24.1 --- requirements-build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-build.txt b/requirements-build.txt index 1e1a21fb8..ae124eb2a 100644 --- a/requirements-build.txt +++ b/requirements-build.txt @@ -8,7 +8,7 @@ cython==3.0.12 # via -r - expandvars==0.9.0 # via -r - -packaging==24.0 +packaging==24.1 # via setuptools-scm pyparsing==3.0.9 # via packaging From dae1e526ba25fda6e4dbd0e1dd4b574f66357307 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 16 Jun 2025 12:20:53 +0200 Subject: [PATCH 3/5] Bump `typing-extensions` to v4.12.2 --- requirements-build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-build.txt b/requirements-build.txt index ae124eb2a..382b4a530 100644 --- a/requirements-build.txt +++ b/requirements-build.txt @@ -16,7 +16,7 @@ setuptools-scm==8.1.0 # via -r - tomli==2.0.1 # via setuptools-scm -typing-extensions==4.10.0 +typing-extensions==4.12.2 # via setuptools-scm wheel==0.37.1 # via -r - From d76bf3333637316a89c1d408179bf9c487b0d3bb Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 16 Jun 2025 12:49:18 +0200 Subject: [PATCH 4/5] Set `MACOSX_DEPLOYMENT_TARGET=10.9` for homebrew This should hopefully overcome the later `delocate`-stage mismatch. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 09f7690df..4380c7ee9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -184,7 +184,7 @@ LD_LIBRARY_PATH = "$(cat /root/.static-deps-path)/lib64:$(cat /root/.static-deps [tool.cibuildwheel.macos] before-build = [ - "brew install libssh", # @0.9.4 # pinning the version does not work + "MACOSX_DEPLOYMENT_TARGET=10.9 brew install libssh", # @0.9.4 # pinning the version does not work # FIXME: can we pre-build libssh once in a pre-requisite job? # NOTE: Currently we use a brew-installed libssh build that also # NOTE: pulls-in openssl@1.1 as well. In the future we may want to From a70d49c3a7891fe49edb0837478df9ea6cfa8646 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Mon, 16 Jun 2025 13:02:09 +0200 Subject: [PATCH 5/5] Force `brew install` to build binary from source --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4380c7ee9..6e0cc0443 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -184,7 +184,7 @@ LD_LIBRARY_PATH = "$(cat /root/.static-deps-path)/lib64:$(cat /root/.static-deps [tool.cibuildwheel.macos] before-build = [ - "MACOSX_DEPLOYMENT_TARGET=10.9 brew install libssh", # @0.9.4 # pinning the version does not work + "MACOSX_DEPLOYMENT_TARGET=10.9 brew install --build-from-source libssh", # @0.9.4 # pinning the version does not work # FIXME: can we pre-build libssh once in a pre-requisite job? # NOTE: Currently we use a brew-installed libssh build that also # NOTE: pulls-in openssl@1.1 as well. In the future we may want to