Skip to content

Commit 18f3f1b

Browse files
authored
Merge pull request hyperspy#139 from ericpre/macos-15-intel
Use `macos-15-intel` GA runner
2 parents 6e4864a + 8bc6bdf commit 18f3f1b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
ARCH: x86_64
102102
TARGET_PLATFORM: win-64
103103
- os: macos
104-
os_version: '13'
104+
os_version: '15-intel'
105105
INSTALLER_EXTENSION: pkg
106106
BLAS_IMPL: mkl
107107
ARCH: x86_64
@@ -129,7 +129,7 @@ jobs:
129129

130130
- name: Install constructor
131131
run: |
132-
conda install constructor>=3.11.2
132+
conda install constructor>=3.12.2
133133
134134
- name: Conda info
135135
run: |
@@ -253,7 +253,8 @@ jobs:
253253
run: |
254254
conda activate "${{ env.install_dir }}"
255255
# test_rank_lstsq_residual fails on windows with MKL
256-
pytest --pyargs hyperspy --reruns 3 -n 2 -k "not test_arpack"
256+
# map_values_std_isset fixed in https://github.com/hyperspy/hyperspy/pull/3554
257+
pytest --pyargs hyperspy --reruns 3 -n 2 -k "not test_arpack and not map_values_std_isset"
257258
258259
- name: Test hyperspy_gui_ipywidgets
259260
if: always()

0 commit comments

Comments
 (0)