diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0198c6aa..c4609231 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: @@ -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" @@ -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 }} @@ -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 diff --git a/CHANGES.md b/CHANGES.md index c0a493d5..f006797e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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) diff --git a/ci/custom-triplets/arm64-osx-dynamic-release.cmake b/ci/custom-triplets/arm64-osx-dynamic-release.cmake index 689f3496..def957a4 100644 --- a/ci/custom-triplets/arm64-osx-dynamic-release.cmake +++ b/ci/custom-triplets/arm64-osx-dynamic-release.cmake @@ -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") diff --git a/ci/custom-triplets/x64-osx-dynamic.cmake b/ci/custom-triplets/x64-osx-dynamic.cmake index 28a55629..e1108ab4 100644 --- a/ci/custom-triplets/x64-osx-dynamic.cmake +++ b/ci/custom-triplets/x64-osx-dynamic.cmake @@ -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") diff --git a/pyproject.toml b/pyproject.toml index 4c15693f..a5c51bcf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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"