From 3cc15d601c4f4e9f50eddff34dee52e7d540ccf2 Mon Sep 17 00:00:00 2001 From: snowman2 Date: Thu, 20 Jun 2024 21:45:07 -0500 Subject: [PATCH 1/3] CI: cibuildwheel@v2.19 --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4dc1259f0..a3aac16a6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -117,7 +117,7 @@ jobs: cp "$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}/share/proj/"* ${GITHUB_WORKSPACE}/pyproj/proj_dir/share/proj/ - name: Build wheels - uses: pypa/cibuildwheel@v2.17 + uses: pypa/cibuildwheel@v2.19 env: CIBW_SKIP: "*musllinux* pp*-win* pp31*" CIBW_ARCHS: ${{ matrix.arch }} From 3603b84cc1fefc4c6409aa851b816d86142aa6f6 Mon Sep 17 00:00:00 2001 From: "Alan D. Snow" Date: Mon, 1 Jul 2024 20:18:47 -0500 Subject: [PATCH 2/3] MACOSX_DEPLOYMENT_TARGET = "12.0" --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a3aac16a6..8b48b4cac 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -132,6 +132,7 @@ jobs: PROJ_VERSION=${{ env.PROJ_VERSION }} PROJ_DIR=${GITHUB_WORKSPACE}/pyproj/proj_dir CMAKE_OSX_ARCHITECTURES='${{ matrix.cmake_osx_architectures }}' + MACOSX_DEPLOYMENT_TARGET='12.0' LDFLAGS="${LDFLAGS} -Wl,-rpath,${GITHUB_WORKSPACE}/pyproj/proj_dir/lib" CIBW_ENVIRONMENT_WINDOWS: PROJ_WHEEL=true From 82be34aef6af087fccfaaed3f754f545b44923a1 Mon Sep 17 00:00:00 2001 From: "Alan D. Snow" Date: Mon, 1 Jul 2024 21:11:11 -0500 Subject: [PATCH 3/3] Update release.yaml --- .github/workflows/release.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8b48b4cac..f879cf024 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -68,9 +68,11 @@ jobs: - os: macos-12 arch: x86_64 cmake_osx_architectures: x86_64 + macos_deployment_target: "12.0" - os: macos-14 arch: arm64 cmake_osx_architectures: arm64 + macos_deployment_target: "14.0" - os: "windows-2022" arch: "auto64" triplet: "x64-windows" @@ -132,7 +134,7 @@ jobs: PROJ_VERSION=${{ env.PROJ_VERSION }} PROJ_DIR=${GITHUB_WORKSPACE}/pyproj/proj_dir CMAKE_OSX_ARCHITECTURES='${{ matrix.cmake_osx_architectures }}' - MACOSX_DEPLOYMENT_TARGET='12.0' + MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos_deployment_target }} LDFLAGS="${LDFLAGS} -Wl,-rpath,${GITHUB_WORKSPACE}/pyproj/proj_dir/lib" CIBW_ENVIRONMENT_WINDOWS: PROJ_WHEEL=true