Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions .github/workflows/build_wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,30 @@ jobs:
strategy:
fail-fast: true
matrix:
platform: [windows-2022, ubuntu-latest, macos-13, macos-14]
platform: [windows-latest, ubuntu-latest, macos-15-intel, macos-14]
env:
CIBW_SKIP: 'pp*'
CIBW_ARCHS: 'auto64'
CIBW_MANYLINUX_X86_64_IMAGE: 'manylinux_2_28'
CIBW_PROJECT_REQUIRES_PYTHON: '>=3.10'
CIBW_TEST_REQUIRES: 'pytest'
MACOSX_DEPLOYMENT_TARGET: '14.0'
defaults:
run:
shell: bash -l {0}

runs-on: ${{ matrix.platform }}

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: true
- name: Set up Python version ${{ matrix.version }}
uses: actions/setup-python@v4
- name: Set up Python version
uses: actions/setup-python@v6
with:
python-version: "3.x"
- name: Install OMP (MacOS Intel)
if: matrix.platform == 'macos-13'
if: matrix.platform == 'macos-15-intel'
run: |
brew install llvm@20 libomp
echo "export CC=/usr/local/opt/llvm@20/bin/clang" >> ~/.bashrc
Expand Down Expand Up @@ -66,7 +67,7 @@ jobs:
export PATH="$pythonLocation:$PATH"
CIBW_TEST_COMMAND='cd ${pwd}/tmp && python -m pytest tests'
echo "CIBW_TEST_COMMAND=${CIBW_TEST_COMMAND}" >> $GITHUB_ENV
python -m pip install cibuildwheel==2.16.5
python -m pip install cibuildwheel==2.23.3
python -m cibuildwheel --output-dir ./wheelhouse
- uses: actions/upload-artifact@v4
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
fail-fast: false
matrix:
platform: [windows-2022, ubuntu-latest, macos-13, macos-14]
platform: [windows-latest, ubuntu-latest, macos-15-intel, macos-latest]
version: ["3.10", "3.13"]
defaults:
run:
Expand All @@ -28,15 +28,15 @@ jobs:
runs-on: ${{ matrix.platform}}

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
submodules: true
- name: Set up Python version ${{ matrix.version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.version }}
- name: Install OMP (MacOS Intel)
if: matrix.platform == 'macos-13'
if: matrix.platform == 'macos-15-intel'
run: |
brew install llvm@20 libomp
echo "export CC=/usr/local/opt/llvm@20/bin/clang" >> ~/.bashrc
Expand All @@ -46,7 +46,7 @@ jobs:
echo "export LDFLAGS=\"$LDFLAGS -Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp\"" >> ~/.bashrc
source ~/.bashrc
- name: Install OMP (MacOS M1)
if: matrix.platform == 'macos-14'
if: matrix.platform == 'macos-latest'
run: |
brew install llvm@20 libomp
echo "export CC=/opt/homebrew/opt/llvm@20/bin/clang" >> ~/.bashrc
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class BuildExt(build_ext):
}

if sys.platform == "darwin":
darwin_opts = ["-stdlib=libc++", "-mmacosx-version-min=10.9"]
darwin_opts = ["-stdlib=libc++"]
c_opts["unix"] = [*darwin_opts, "-fopenmp", "-O2"]
l_opts["unix"] = [*darwin_opts, "-lomp"]

Expand Down
3 changes: 3 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
import tempfile
from pathlib import Path

import matplotlib

matplotlib.use("Agg")
import numpy as np
import pytest

Expand Down