Skip to content

Commit

Permalink
BLD/RLS: Bump MacOS wheels to MacOS 11 (+ bump cibuildwheel from 2.17…
Browse files Browse the repository at this point in the history
….0 to 2.18.1) (#417)
  • Loading branch information
dependabot[bot] authored Jun 10, 2024
1 parent ffea442 commit 16bf4c2
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
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
7 changes: 6 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@

### Bug fixes

- Fix bug preventing reading from file paths containing hashes in `read_dataframe` (#412)
- Fix bug preventing reading from file paths containing hashes in `read_dataframe` (#412)

### Packaging

- MacOS wheels are now only available for macOS 12+. For older unsupported macOS
versions, pyogrio can still be built from source (requires GDAL to be installed) (#417).

## 0.8.0 (2024-05-06)

Expand Down
1 change: 1 addition & 0 deletions ci/custom-triplets/arm64-osx-dynamic-release.cmake
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
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
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

0 comments on commit 16bf4c2

Please sign in to comment.