From 77f613d2afba8e1e20de8085d33d12e8329c48b1 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Thu, 5 Dec 2024 16:22:54 -0500 Subject: [PATCH 1/3] python 3.13 + native macos runners --- .github/workflows/build_wheels.yml | 4 +--- pyproject.toml | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index ff9cec6f..34e3b12e 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -12,14 +12,12 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macos-12, windows-2022] + os: [ubuntu-20.04, windows-2022, macos-13, macos-14] steps: - uses: actions/checkout@v4 - name: Build wheels uses: pypa/cibuildwheel@v2.22.0 - env: - CIBW_ARCHS_MACOS: x86_64 arm64 - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index 50be09f9..fd58f596 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,13 +56,12 @@ skip = [ "cp36*", "cp37*", "cp38*", - "cp313-*", ] test-requires = ["pytest", "pytest-xdist"] [tool.cibuildwheel.macos] before-build = [ - "bash build_tools/prepare_macos_wheel.sh", + "conda create -n build 'llvm-openmp=11'", ] [tool.cibuildwheel.macos.environment] From 9a6ab485e209048498c4268bd30d619620affbb5 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Thu, 5 Dec 2024 16:24:53 -0500 Subject: [PATCH 2/3] add Martin to codeowners --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a5e34ba7..54e296dc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @MarcAntoineSchmidtQC @jtilly @lbittarello +* @MarcAntoineSchmidtQC @jtilly @lbittarello @stanmart From dd5c78b2b7414e0a4dc5206956c9e7c292113eae Mon Sep 17 00:00:00 2001 From: Marc-Antoine Schmidt Date: Thu, 5 Dec 2024 16:28:09 -0500 Subject: [PATCH 3/3] fix conda --- .github/workflows/build_wheels.yml | 2 ++ pyproject.toml | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index 34e3b12e..1a93ca92 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -16,6 +16,8 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Set up micromamba + uses: mamba-org/setup-micromamba@06375d89d211a1232ef63355742e9e2e564bc7f7 - name: Build wheels uses: pypa/cibuildwheel@v2.22.0 - uses: actions/upload-artifact@v4 diff --git a/pyproject.toml b/pyproject.toml index fd58f596..ae65043f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,13 +61,13 @@ test-requires = ["pytest", "pytest-xdist"] [tool.cibuildwheel.macos] before-build = [ - "conda create -n build 'llvm-openmp=11'", + "/Users/runner/micromamba-bin/micromamba create -y -p $MAMBA_ROOT_PREFIX/envs/build -c conda-forge 'llvm-openmp=11'", ] [tool.cibuildwheel.macos.environment] -LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib" -CFLAGS="-I$CONDA/envs/build/include" -CXXFLAGS="-I$CONDA/envs/build/include" +LDFLAGS="-Wl,-rpath,$MAMBA_ROOT_PREFIX/envs/build/lib -L$MAMBA_ROOT_PREFIX/envs/build/lib" +CFLAGS="-I$MAMBA_ROOT_PREFIX/envs/build/include" +CXXFLAGS="-I$MAMBA_ROOT_PREFIX/envs/build/include" CXX="/usr/bin/clang++" CC="/usr/bin/clang" MACOSX_DEPLOYMENT_TARGET="10.13"