From bd89a2a4d83f4b655705284b914a4ed6d2a4adcb Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 12 May 2025 14:42:47 +0100 Subject: [PATCH 1/5] Attempt to run H5 tests on macOS Silicon again --- .github/workflows/test-with-pip.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index f9b0e23e..919e1789 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -20,14 +20,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies and local packages (not macOS) + - name: Install dependencies and local packages run: python -m pip install .[gui,h5,preferences] - if: matrix.os != 'macos-latest' - - name: Install dependencies and local packages (macOS) - run: python -m pip install .[gui,preferences] - # PyTables currently won't build on Apple Silicon, so exclude the h5 deps - # xref: enthought/apptools/issues/344 - if: matrix.os == 'macos-latest' - name: Run tests run: | mkdir testdir From e1a8fb56ebe9d0dca69d4da1605a0d6d24b1ae13 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 12 May 2025 14:48:10 +0100 Subject: [PATCH 2/5] Restore split; run h5 tests on macOS for Python >= 3.10 --- .github/workflows/test-with-pip.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 919e1789..fe11b3ff 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -20,8 +20,15 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies and local packages + - name: Install dependencies and local packages (not macOS) run: python -m pip install .[gui,h5,preferences] + if: matrix.os != 'macos-latest' || ${{ matrix.python-version }} >= '3.10' + - name: Install dependencies and local packages (macOS) + run: python -m pip install .[gui,preferences] + # PyTables won't build on Apple Silicon for Python >= 3.10, so exclude + # the h5 dep + # xref: enthought/apptools/issues/344 + if: matrix.os == 'macos-latest' && ${{ matrix.python-version }} < '3.10' - name: Run tests run: | mkdir testdir From d07f3bda950f0dde5e4bef2fedd5e2d332871fab Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 12 May 2025 15:03:43 +0100 Subject: [PATCH 3/5] Don't try to compare version strings as strings --- .github/workflows/test-with-pip.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index fe11b3ff..2defe54a 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -22,13 +22,13 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies and local packages (not macOS) run: python -m pip install .[gui,h5,preferences] - if: matrix.os != 'macos-latest' || ${{ matrix.python-version }} >= '3.10' + if: matrix.os != 'macos-latest' || (${{ matrix.python-version }} != '3.8' && ${{ matrix.python-version }} != '3.9') - name: Install dependencies and local packages (macOS) run: python -m pip install .[gui,preferences] - # PyTables won't build on Apple Silicon for Python >= 3.10, so exclude - # the h5 dep + # PyTables won't build on Apple Silicon for Python < 3.10, so exclude + # the h5 dependency. # xref: enthought/apptools/issues/344 - if: matrix.os == 'macos-latest' && ${{ matrix.python-version }} < '3.10' + if: matrix.os == 'macos-latest' && (${{ matrix.python-version }} == '3.8' || ${{ matrix.python-version }} == '3.9') - name: Run tests run: | mkdir testdir From a4104877b0120e2da83587c3b9f71b7b9954e36c Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 12 May 2025 16:59:14 +0100 Subject: [PATCH 4/5] Try to fix expression syntax --- .github/workflows/test-with-pip.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 2defe54a..78b1fa68 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -22,13 +22,13 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies and local packages (not macOS) run: python -m pip install .[gui,h5,preferences] - if: matrix.os != 'macos-latest' || (${{ matrix.python-version }} != '3.8' && ${{ matrix.python-version }} != '3.9') + if: (matrix.os != 'macos-latest') || ((matrix.python-version != '3.8') && (matrix.python-version != '3.9')) - name: Install dependencies and local packages (macOS) run: python -m pip install .[gui,preferences] # PyTables won't build on Apple Silicon for Python < 3.10, so exclude # the h5 dependency. # xref: enthought/apptools/issues/344 - if: matrix.os == 'macos-latest' && (${{ matrix.python-version }} == '3.8' || ${{ matrix.python-version }} == '3.9') + if: (matrix.os == 'macos-latest') && ((matrix.python-version == '3.8') || (matrix.python-version == '3.9')) - name: Run tests run: | mkdir testdir From 51c1a6214f57ac9787d8190b86ccedfdd94778ff Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 12 May 2025 17:04:46 +0100 Subject: [PATCH 5/5] Update test-with-pip.yml Better step descriptions --- .github/workflows/test-with-pip.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml index 78b1fa68..f2a9b23c 100644 --- a/.github/workflows/test-with-pip.yml +++ b/.github/workflows/test-with-pip.yml @@ -20,10 +20,10 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies and local packages (not macOS) + - name: Install dependencies and local packages run: python -m pip install .[gui,h5,preferences] if: (matrix.os != 'macos-latest') || ((matrix.python-version != '3.8') && (matrix.python-version != '3.9')) - - name: Install dependencies and local packages (macOS) + - name: Install dependencies and local packages (exclude h5) run: python -m pip install .[gui,preferences] # PyTables won't build on Apple Silicon for Python < 3.10, so exclude # the h5 dependency.