Skip to content

BLD/RLS: Bump MacOS wheels to MacOS 12 (+ bump cibuildwheel from 2.17.0 to 2.18.1) #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 10, 2024
Merged

BLD/RLS: Bump MacOS wheels to MacOS 12 (+ bump cibuildwheel from 2.17.0 to 2.18.1) #417

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
be4f570
Bump pypa/cibuildwheel from 2.17.0 to 2.18.1
dependabot[bot] May 27, 2024
4560027
add explicit MACOSX_DEPLOYMENT_TARGET
jorisvandenbossche Jun 7, 2024
ae35fb6
10.9 -> 10.12
jorisvandenbossche Jun 7, 2024
4cdf7c3
10 -> 11
jorisvandenbossche Jun 7, 2024
05783c3
11 -> 12
jorisvandenbossche Jun 7, 2024
05f51f0
try building on 12 targetting 11
jorisvandenbossche Jun 8, 2024
de6df0a
try vcpkg env variable
jorisvandenbossche Jun 8, 2024
efda0fc
bump cache
jorisvandenbossche Jun 8, 2024
2cc64e3
try set env variable in triplet
jorisvandenbossche Jun 8, 2024
16d61dc
update arm64 as well, try 10.12
jorisvandenbossche Jun 8, 2024
ddc08fb
try 10.14
jorisvandenbossche Jun 8, 2024
f3ce01b
back to 11.0 target, clean-up
jorisvandenbossche Jun 8, 2024
afc8f2e
back to 12
jorisvandenbossche Jun 8, 2024
c58d22a
also test on 12
jorisvandenbossche Jun 8, 2024
b773069
cleanup
jorisvandenbossche Jun 9, 2024
5461f81
add changelog
jorisvandenbossche Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
BUILDKIT_PROGRESS: plain

- name: Build wheels
uses: pypa/cibuildwheel@v2.17.0
uses: pypa/cibuildwheel@v2.18.1

- uses: actions/upload-artifact@v4
with:
Expand All @@ -128,13 +128,13 @@ jobs:
fail-fast: false
matrix:
include:
- os: "macos-11"
- os: "macos-12"
triplet: "x64-osx-dynamic"
arch: x86_64
vcpkg_cache: "/Users/runner/.cache/vcpkg/archives"
vcpkg_logs: "/usr/local/share/vcpkg/buildtrees/**/*.log"

- os: "macos-11"
- os: "macos-12"
triplet: "arm64-osx-dynamic-release"
arch: arm64
vcpkg_cache: "/Users/runner/.cache/vcpkg/archives"
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
path: ${{ matrix.vcpkg_logs }}

- name: Build wheels
uses: pypa/cibuildwheel@v2.17.0
uses: pypa/cibuildwheel@v2.18.1
env:
# CIBW needs to know triplet for the correct install path
VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
Expand All @@ -215,14 +215,14 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-20.04", "windows-latest", "macos-11", "macos-latest"]
os: ["ubuntu-20.04", "windows-latest", "macos-12", "macos-latest"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
include:
- os: "ubuntu-20.04"
artifact: pyogrio-wheel-linux
- os: "windows-latest"
artifact: pyogrio-wheel-x64-windows-dynamic-release
- os: "macos-11"
- os: "macos-12"
artifact: pyogrio-wheel-x64-osx-dynamic
- os: "macos-latest"
artifact: pyogrio-wheel-x64-osx-dynamic
Expand Down
1 change: 1 addition & 0 deletions ci/custom-triplets/arm64-osx-dynamic-release.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES arm64)
set(VCPKG_BUILD_TYPE release)
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")

set(VCPKG_LIBRARY_LINKAGE static)
if(PORT MATCHES "gdal")
Expand Down
1 change: 1 addition & 0 deletions ci/custom-triplets/x64-osx-dynamic.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_BUILD_TYPE release)
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")

set(VCPKG_LIBRARY_LINKAGE static)
if(PORT MATCHES "gdal")
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ GDAL_VERSION = "3.8.5"
PYOGRIO_PACKAGE_DATA = 1
GDAL_DATA = "$VCPKG_INSTALL/share/gdal"
PROJ_LIB = "$VCPKG_INSTALL/share/proj"
MACOSX_DEPLOYMENT_TARGET = "12.0"

[tool.cibuildwheel.windows]
before-build = "pip install delvewheel"
Expand Down
Loading