Skip to content

Commit

Permalink
Try installing ffmpeg with brew, to reliably get ffmpeg binary on App…
Browse files Browse the repository at this point in the history
…le Silicon macos arm64
  • Loading branch information
GenevieveBuckley committed Jun 4, 2024
1 parent 87ef046 commit 1c3684b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/test_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ jobs:
with:
python-version: "3.x"

# Temporary fix for 'pip install imageio[ffmpeg]'
# not including the FFMPEG binary on Apple Silicon macs
# This step can be removed when issue is fixed in imageio-ffmpeg
# https://github.com/imageio/imageio-ffmpeg/issues/71
- name: brew install ffmpeg
if: runner.os == 'macOS'
run: |
brew update
brew install ffmpeg
- name: Install dependencies
run: |
pip install --upgrade pip
Expand All @@ -47,9 +57,8 @@ jobs:
strategy:
fail-fast: false
matrix:
# Upgrade to macos-latest when ffmpeg binaries are available for Mac arm-64
# https://github.com/imageio/imageio-ffmpeg/issues/71
platform: [ ubuntu-latest, windows-latest, macos-13 ]
# PySide currently unavailable for MacOS arm64, test with macos-13
platform: [ ubuntu-latest, windows-latest, macos-latest, macos-13 ]
python-version: [ "3.9", "3.10", "3.11", "3.12" ]

steps:
Expand Down
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# For more information about tox, see https://tox.readthedocs.io/en/latest/
[tox]
envlist = py{39,310,311,312}-{linux,macos,windows}-pyqt, py{39,310}-{linux,macos}-pyside
envlist = py{39,310,311,312}-{linux,macos,windows}-pyqt, py{39,310}-{linux,macos-intel}-pyside

[gh-actions]
python =
Expand All @@ -12,7 +12,8 @@ python =
[gh-actions:env]
PLATFORM =
ubuntu-latest: linux
macos-13: macos # PySide currently unavailable for MacOS arm64
macos-latest: macos
macos-13: macos-intel # PySide currently unavailable for MacOS arm64
windows-latest: windows

[testenv]
Expand Down Expand Up @@ -48,7 +49,7 @@ deps =
# and https://github.com/napari/napari/issues/5884#issuecomment-1584160532
# Windows PySide problems https://github.com/napari/napari/pull/6721/files
# and https://github.com/napari/napari/pull/6711/
[testenv:py{39,310}-{linux,macos}-pyside]
[testenv:py{39,310}-{linux,macos-intel}-pyside]
deps =
napari[pyside2,testing]
lxml_html_clean # should only be needed till napari 0.5.0
Expand Down

0 comments on commit 1c3684b

Please sign in to comment.