Skip to content

Commit 0ef08e4

Browse files
authored
Updates GitHub action runner OS (#191)
1 parent 6ae1ac8 commit 0ef08e4

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

.github/workflows/build_wheel.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,30 @@ jobs:
1111
strategy:
1212
fail-fast: true
1313
matrix:
14-
platform: [windows-2022, ubuntu-latest, macos-13, macos-14]
14+
platform: [windows-latest, ubuntu-latest, macos-15-intel, macos-14]
1515
env:
1616
CIBW_SKIP: 'pp*'
1717
CIBW_ARCHS: 'auto64'
1818
CIBW_MANYLINUX_X86_64_IMAGE: 'manylinux_2_28'
1919
CIBW_PROJECT_REQUIRES_PYTHON: '>=3.10'
2020
CIBW_TEST_REQUIRES: 'pytest'
21+
MACOSX_DEPLOYMENT_TARGET: '14.0'
2122
defaults:
2223
run:
2324
shell: bash -l {0}
2425

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

2728
steps:
28-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
2930
with:
3031
submodules: true
31-
- name: Set up Python version ${{ matrix.version }}
32-
uses: actions/setup-python@v4
32+
- name: Set up Python version
33+
uses: actions/setup-python@v6
3334
with:
3435
python-version: "3.x"
3536
- name: Install OMP (MacOS Intel)
36-
if: matrix.platform == 'macos-13'
37+
if: matrix.platform == 'macos-15-intel'
3738
run: |
3839
brew install llvm@20 libomp
3940
echo "export CC=/usr/local/opt/llvm@20/bin/clang" >> ~/.bashrc
@@ -66,7 +67,7 @@ jobs:
6667
export PATH="$pythonLocation:$PATH"
6768
CIBW_TEST_COMMAND='cd ${pwd}/tmp && python -m pytest tests'
6869
echo "CIBW_TEST_COMMAND=${CIBW_TEST_COMMAND}" >> $GITHUB_ENV
69-
python -m pip install cibuildwheel==2.16.5
70+
python -m pip install cibuildwheel==2.23.3
7071
python -m cibuildwheel --output-dir ./wheelhouse
7172
- uses: actions/upload-artifact@v4
7273
with:

.github/workflows/run_tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
platform: [windows-2022, ubuntu-latest, macos-13, macos-14]
22+
platform: [windows-latest, ubuntu-latest, macos-15-intel, macos-latest]
2323
version: ["3.10", "3.13"]
2424
defaults:
2525
run:
@@ -28,15 +28,15 @@ jobs:
2828
runs-on: ${{ matrix.platform}}
2929

3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
with:
3333
submodules: true
3434
- name: Set up Python version ${{ matrix.version }}
35-
uses: actions/setup-python@v4
35+
uses: actions/setup-python@v6
3636
with:
3737
python-version: ${{ matrix.version }}
3838
- name: Install OMP (MacOS Intel)
39-
if: matrix.platform == 'macos-13'
39+
if: matrix.platform == 'macos-15-intel'
4040
run: |
4141
brew install llvm@20 libomp
4242
echo "export CC=/usr/local/opt/llvm@20/bin/clang" >> ~/.bashrc
@@ -46,7 +46,7 @@ jobs:
4646
echo "export LDFLAGS=\"$LDFLAGS -Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp\"" >> ~/.bashrc
4747
source ~/.bashrc
4848
- name: Install OMP (MacOS M1)
49-
if: matrix.platform == 'macos-14'
49+
if: matrix.platform == 'macos-latest'
5050
run: |
5151
brew install llvm@20 libomp
5252
echo "export CC=/opt/homebrew/opt/llvm@20/bin/clang" >> ~/.bashrc

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class BuildExt(build_ext):
6969
}
7070

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

tests/conftest.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
import tempfile
33
from pathlib import Path
44

5+
import matplotlib
6+
7+
matplotlib.use("Agg")
58
import numpy as np
69
import pytest
710

0 commit comments

Comments
 (0)