From 0cdf583fb2d5921cc4d33db1ea347075f5897c47 Mon Sep 17 00:00:00 2001 From: alessandrofelder Date: Mon, 29 Apr 2024 13:57:49 +0100 Subject: [PATCH 1/6] CI for both Mac architectures --- .github/workflows/test_and_deploy.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 47b6dc33..62f2eed0 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -38,8 +38,10 @@ jobs: # Run all supported Python versions on linux python-version: ["3.9", "3.10", "3.11"] os: [ubuntu-latest] - # Include one windows and macos run + # Include one windows and macos run each of Intel/ARM include: + - os: macos-13 + python-version: "3.11" - os: macos-latest python-version: "3.11" - os: windows-latest From bca16ae91fd8e19288641cdc6cf3f3529ebe66c3 Mon Sep 17 00:00:00 2001 From: alessandrofelder Date: Mon, 29 Apr 2024 13:58:25 +0100 Subject: [PATCH 2/6] remove hdf5 installation CI step --- .github/workflows/test_and_deploy.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 62f2eed0..2d0fb9dd 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -48,10 +48,6 @@ jobs: python-version: "3.11" steps: - - name: Install hdf5 libs for Mac - if: runner.os == 'macOS' - run: brew install hdf5 - # Helps set up VTK with a headless display - uses: pyvista/setup-headless-display-action@v2 From 63a2fb8015cd157506e6b4b7931a63fff1098838 Mon Sep 17 00:00:00 2001 From: alessandrofelder Date: Mon, 29 Apr 2024 13:59:35 +0100 Subject: [PATCH 3/6] depend on pandas[hdf5] explicitly --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 20c4e195..5b231cce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ dependencies = [ "msgpack", "myterial", "numpy", - "pandas", + "pandas[hdf5]", "pooch", "pyinspect>=0.0.8", "pyyaml>=5.3", From d45f04a370a6d50fafc92c2a0116d5f6bd055def Mon Sep 17 00:00:00 2001 From: alessandrofelder Date: Mon, 29 Apr 2024 14:14:34 +0100 Subject: [PATCH 4/6] try to use brew for ffmpeg on M1 Mac --- .github/workflows/test_and_deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 2d0fb9dd..8068cfb2 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -53,8 +53,13 @@ jobs: # Sets up ffmpeg to we can run video tests on CI - uses: FedericoCarboni/setup-ffmpeg@v2 + if: matrix.os != 'macos-latest' id: setup-ffmpeg + - name: setup ffmpeg on latest Mac with brew + if: matrix.os == 'macos-latest' + run: brew install ffmpeg + # Run tests - uses: neuroinformatics-unit/actions/test@v2 with: From c9fb7ab06652d3784b511cd5dec1e4c9f9a97385 Mon Sep 17 00:00:00 2001 From: alessandrofelder Date: Mon, 29 Apr 2024 14:19:14 +0100 Subject: [PATCH 5/6] Revert "depend on pandas[hdf5] explicitly" This reverts commit 63a2fb8015cd157506e6b4b7931a63fff1098838. --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5b231cce..20c4e195 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ dependencies = [ "msgpack", "myterial", "numpy", - "pandas[hdf5]", + "pandas", "pooch", "pyinspect>=0.0.8", "pyyaml>=5.3", From 47ee9f1b84135edd6eb2a12bdf8ad2b9bfcce757 Mon Sep 17 00:00:00 2001 From: alessandrofelder Date: Mon, 29 Apr 2024 14:19:35 +0100 Subject: [PATCH 6/6] Revert "remove hdf5 installation CI step" This reverts commit bca16ae91fd8e19288641cdc6cf3f3529ebe66c3. --- .github/workflows/test_and_deploy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 8068cfb2..d10c8fc8 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -48,6 +48,10 @@ jobs: python-version: "3.11" steps: + - name: Install hdf5 libs for Mac + if: runner.os == 'macOS' + run: brew install hdf5 + # Helps set up VTK with a headless display - uses: pyvista/setup-headless-display-action@v2