From a3ef572476cf4bd28c3a7a551bfb22a19fea2482 Mon Sep 17 00:00:00 2001 From: Vasu Jaganath Date: Mon, 24 Nov 2025 10:18:26 -0500 Subject: [PATCH 1/3] migrate from macos-13 to macos-14 --- .github/workflows/build_and_test_mac.yml | 4 ++-- .github/workflows/build_wheels.yml | 10 +++++++--- .github/workflows/publish_pypi.yml | 10 +++++++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_and_test_mac.yml b/.github/workflows/build_and_test_mac.yml index 53105ac..a807ea0 100644 --- a/.github/workflows/build_and_test_mac.yml +++ b/.github/workflows/build_and_test_mac.yml @@ -12,7 +12,7 @@ env: jobs: Build_and_Run_GTest: name: Build and Run GoogleTest - runs-on: macos-13 + runs-on: macos-14-large defaults: run: shell: bash -l {0} @@ -46,7 +46,7 @@ jobs: Build_and_Run_PyTest: name: Build and Run PyTest - runs-on: macos-13 + runs-on: macos-14-large defaults: run: shell: bash -l {0} diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index b331b71..6720ac5 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -12,7 +12,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "10.15" strategy: matrix: - os: [ubuntu-22.04, macos-13, windows-latest, ubuntu-22.04-arm] + os: [ubuntu-22.04, macos-14-large, windows-latest, ubuntu-22.04-arm] cibw_archs: ["auto64"] cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp313"] @@ -71,7 +71,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "11.0" strategy: matrix: - os: [macos-13-xlarge] + os: [macos-14-xlarge] cibw_archs: ["arm64"] cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp313"] @@ -101,7 +101,11 @@ jobs: CIBW_BEFORE_ALL_MACOS: bash ci-utils/install_prereq_linux.sh && mkdir -p /tmp/filepattern_bld && cp -r local_install /tmp/filepattern_bld - CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/filepattern_bld/local_install/lib:/tmp/filepattern_bld/local_install/lib64" ON_GITHUB="TRUE" FILEPATTERN_DEP_DIR="/tmp/filepattern_bld/local_install" + CIBW_ENVIRONMENT_MACOS: >- + MACOSX_DEPLOYMENT_TARGET=11.0 + REPAIR_LIBRARY_PATH="/tmp/filepattern_bld/local_install/lib:/tmp/filepattern_bld/local_install/lib64" + ON_GITHUB="TRUE" + FILEPATTERN_DEP_DIR="/tmp/filepattern_bld/local_install" CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel} CIBW_ARCHS: ${{ matrix.cibw_archs }} CIBW_TEST_REQUIRES: pytest pydantic diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 585f395..42d41d0 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -14,7 +14,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "10.15" strategy: matrix: - os: [ubuntu-22.04, macos-13, windows-latest, ubuntu-22.04-arm] + os: [ubuntu-22.04, macos-14-large, windows-latest, ubuntu-22.04-arm] cibw_archs: ["auto64"] cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"] @@ -77,7 +77,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "11.0" strategy: matrix: - os: [macos-13-xlarge] + os: [macos-14-xlarge] cibw_archs: ["arm64"] cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"] @@ -107,7 +107,11 @@ jobs: CIBW_BEFORE_ALL_MACOS: bash ci-utils/install_prereq_linux.sh && mkdir -p /tmp/filepattern_bld && cp -r local_install /tmp/filepattern_bld - CIBW_ENVIRONMENT_MACOS: REPAIR_LIBRARY_PATH="/tmp/filepattern_bld/local_install/lib:/tmp/filepattern_bld/local_install/lib64" ON_GITHUB="TRUE" FILEPATTERN_DEP_DIR="/tmp/filepattern_bld/local_install" + CIBW_ENVIRONMENT_MACOS: >- + MACOSX_DEPLOYMENT_TARGET=11.0 + REPAIR_LIBRARY_PATH="/tmp/filepattern_bld/local_install/lib:/tmp/filepattern_bld/local_install/lib64" + ON_GITHUB="TRUE" + FILEPATTERN_DEP_DIR="/tmp/filepattern_bld/local_install" CIBW_REPAIR_WHEEL_COMMAND_MACOS: DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} && DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel} CIBW_ARCHS: ${{ matrix.cibw_archs }} CIBW_TEST_REQUIRES: pytest pydantic From 8b43e1fcf26da9a94cc20eb7538b78e35271ea7b Mon Sep 17 00:00:00 2001 From: Vasu Jaganath Date: Mon, 24 Nov 2025 10:51:27 -0500 Subject: [PATCH 2/3] drop python 3.9 --- .github/workflows/build_wheels.yml | 4 ++-- .github/workflows/publish_pypi.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 6720ac5..abe289f 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -14,7 +14,7 @@ jobs: matrix: os: [ubuntu-22.04, macos-14-large, windows-latest, ubuntu-22.04-arm] cibw_archs: ["auto64"] - cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp313"] + cibw_build: ["cp310", "cp311", "cp312", "cp313"] steps: - uses: actions/checkout@v3 @@ -73,7 +73,7 @@ jobs: matrix: os: [macos-14-xlarge] cibw_archs: ["arm64"] - cibw_build: ["cp39", "cp310", "cp311", "cp312", "cp313"] + cibw_build: ["cp310", "cp311", "cp312", "cp313"] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/publish_pypi.yml b/.github/workflows/publish_pypi.yml index 42d41d0..00e6579 100644 --- a/.github/workflows/publish_pypi.yml +++ b/.github/workflows/publish_pypi.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-22.04, macos-14-large, windows-latest, ubuntu-22.04-arm] cibw_archs: ["auto64"] - cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"] + cibw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*"] steps: - uses: actions/checkout@v3 @@ -79,7 +79,7 @@ jobs: matrix: os: [macos-14-xlarge] cibw_archs: ["arm64"] - cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"] + cibw_build: ["cp310-*", "cp311-*", "cp312-*", "cp313-*"] steps: - uses: actions/checkout@v3 From d3d87d17181636965ad86cdc88dda57fdb0e5c23 Mon Sep 17 00:00:00 2001 From: Vasu Jaganath Date: Mon, 24 Nov 2025 11:09:58 -0500 Subject: [PATCH 3/3] fix Cmake version mis match when doing build and test --- tests/cpp/CMakeLists.txt.gtest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cpp/CMakeLists.txt.gtest b/tests/cpp/CMakeLists.txt.gtest index be5596e..a7ef6de 100644 --- a/tests/cpp/CMakeLists.txt.gtest +++ b/tests/cpp/CMakeLists.txt.gtest @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.2) +cmake_minimum_required(VERSION 3.20) project(googletest-download NONE)