From 9d665b652a2d817293ba8621298e64c15984db2c Mon Sep 17 00:00:00 2001 From: Meg Schwamb Date: Sun, 24 Nov 2024 20:22:20 +0000 Subject: [PATCH 1/9] Update testing-and-coverage.yml attempt to fix pkgconf error for osx --- .github/workflows/testing-and-coverage.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testing-and-coverage.yml b/.github/workflows/testing-and-coverage.yml index 9dd23996..896c17a6 100644 --- a/.github/workflows/testing-and-coverage.yml +++ b/.github/workflows/testing-and-coverage.yml @@ -26,7 +26,9 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install hdf5 on mac if: ${{startsWith( matrix.os, 'macos' ) }} - run: brew install hdf5 + run: | + brew install pkgconf + brew install hdf5 - name: Install dependencies run: | python -m pip install --upgrade pip From d80d7d0c92e38545120f067af503d40b42b94d22 Mon Sep 17 00:00:00 2001 From: Meg Schwamb Date: Sun, 24 Nov 2024 20:27:37 +0000 Subject: [PATCH 2/9] Update testing-and-coverage.yml --- .github/workflows/testing-and-coverage.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/testing-and-coverage.yml b/.github/workflows/testing-and-coverage.yml index 896c17a6..2ae203c7 100644 --- a/.github/workflows/testing-and-coverage.yml +++ b/.github/workflows/testing-and-coverage.yml @@ -14,7 +14,7 @@ jobs: strategy: max-parallel: 4 matrix: - os: ['macos-latest','ubuntu-latest'] + os: ['macos-14','ubuntu-latest'] python-version: ['3.10', '3.11'] runs-on: ${{ matrix.os }} @@ -26,9 +26,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install hdf5 on mac if: ${{startsWith( matrix.os, 'macos' ) }} - run: | - brew install pkgconf - brew install hdf5 + run: brew install hdf5 - name: Install dependencies run: | python -m pip install --upgrade pip From f07ea545cc9bf66fa8e62a4c819ef8b1d80b11bf Mon Sep 17 00:00:00 2001 From: Meg Schwamb Date: Sun, 24 Nov 2024 20:30:54 +0000 Subject: [PATCH 3/9] Update testing-and-coverage.yml --- .github/workflows/testing-and-coverage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testing-and-coverage.yml b/.github/workflows/testing-and-coverage.yml index 2ae203c7..e1f58743 100644 --- a/.github/workflows/testing-and-coverage.yml +++ b/.github/workflows/testing-and-coverage.yml @@ -14,8 +14,8 @@ jobs: strategy: max-parallel: 4 matrix: - os: ['macos-14','ubuntu-latest'] - python-version: ['3.10', '3.11'] + os: ['macos-latest','ubuntu-latest'] + python-version: ['3.11', '3.12'] runs-on: ${{ matrix.os }} steps: @@ -26,7 +26,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install hdf5 on mac if: ${{startsWith( matrix.os, 'macos' ) }} - run: brew install hdf5 + run: brew install hdf5 - name: Install dependencies run: | python -m pip install --upgrade pip From 944e91a19682e9408241854b3631f53c2d0424aa Mon Sep 17 00:00:00 2001 From: Meg Schwamb Date: Sun, 24 Nov 2024 20:33:41 +0000 Subject: [PATCH 4/9] Update testing-and-coverage.yml --- .github/workflows/testing-and-coverage.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing-and-coverage.yml b/.github/workflows/testing-and-coverage.yml index e1f58743..ed92442f 100644 --- a/.github/workflows/testing-and-coverage.yml +++ b/.github/workflows/testing-and-coverage.yml @@ -15,7 +15,7 @@ jobs: max-parallel: 4 matrix: os: ['macos-latest','ubuntu-latest'] - python-version: ['3.11', '3.12'] + python-version: ['3.10', '3.11'] runs-on: ${{ matrix.os }} steps: @@ -26,7 +26,9 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install hdf5 on mac if: ${{startsWith( matrix.os, 'macos' ) }} - run: brew install hdf5 + run: | + brew update + brew install hdf5 - name: Install dependencies run: | python -m pip install --upgrade pip From 459b800c1baaf20aa8f88e8c5af75de2d7385862 Mon Sep 17 00:00:00 2001 From: Meg Schwamb Date: Sun, 24 Nov 2024 20:35:16 +0000 Subject: [PATCH 5/9] Update testing-and-coverage.yml --- .github/workflows/testing-and-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing-and-coverage.yml b/.github/workflows/testing-and-coverage.yml index ed92442f..a0eb1546 100644 --- a/.github/workflows/testing-and-coverage.yml +++ b/.github/workflows/testing-and-coverage.yml @@ -27,7 +27,7 @@ jobs: - name: Install hdf5 on mac if: ${{startsWith( matrix.os, 'macos' ) }} run: | - brew update + brew link --overwrite pkgconf brew install hdf5 - name: Install dependencies run: | From be2214ef434239b243eb7599ddba2a758907a33a Mon Sep 17 00:00:00 2001 From: Meg Schwamb Date: Sun, 24 Nov 2024 20:37:02 +0000 Subject: [PATCH 6/9] Update testing-and-coverage.yml --- .github/workflows/testing-and-coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing-and-coverage.yml b/.github/workflows/testing-and-coverage.yml index a0eb1546..2fca7506 100644 --- a/.github/workflows/testing-and-coverage.yml +++ b/.github/workflows/testing-and-coverage.yml @@ -27,6 +27,7 @@ jobs: - name: Install hdf5 on mac if: ${{startsWith( matrix.os, 'macos' ) }} run: | + brew install pyconf brew link --overwrite pkgconf brew install hdf5 - name: Install dependencies From 29bc017249e5dd27d841ae5c130b0b1eee3ce34a Mon Sep 17 00:00:00 2001 From: Meg Schwamb Date: Sun, 24 Nov 2024 20:38:27 +0000 Subject: [PATCH 7/9] Update testing-and-coverage.yml --- .github/workflows/testing-and-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing-and-coverage.yml b/.github/workflows/testing-and-coverage.yml index 2fca7506..dd0c7039 100644 --- a/.github/workflows/testing-and-coverage.yml +++ b/.github/workflows/testing-and-coverage.yml @@ -27,7 +27,7 @@ jobs: - name: Install hdf5 on mac if: ${{startsWith( matrix.os, 'macos' ) }} run: | - brew install pyconf + brew install pkgconf brew link --overwrite pkgconf brew install hdf5 - name: Install dependencies From f60b7d152e2e1b108816ce9a99fefefcd658f7ea Mon Sep 17 00:00:00 2001 From: Meg Schwamb Date: Sun, 24 Nov 2024 20:42:19 +0000 Subject: [PATCH 8/9] Update testing-and-coverage.yml --- .github/workflows/testing-and-coverage.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/testing-and-coverage.yml b/.github/workflows/testing-and-coverage.yml index dd0c7039..98e6e079 100644 --- a/.github/workflows/testing-and-coverage.yml +++ b/.github/workflows/testing-and-coverage.yml @@ -27,9 +27,8 @@ jobs: - name: Install hdf5 on mac if: ${{startsWith( matrix.os, 'macos' ) }} run: | - brew install pkgconf - brew link --overwrite pkgconf - brew install hdf5 + python -m pip install --upgrade pip + pip install h5py - name: Install dependencies run: | python -m pip install --upgrade pip From 6b1bd17f2fe924111c843c45569c6d587232e691 Mon Sep 17 00:00:00 2001 From: Meg Schwamb Date: Sun, 24 Nov 2024 20:49:24 +0000 Subject: [PATCH 9/9] Update smoke-test.yml fixing smoke test with the same pip install of the python package that has hdf5 --- .github/workflows/smoke-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/smoke-test.yml b/.github/workflows/smoke-test.yml index 61504c27..7da08b6c 100644 --- a/.github/workflows/smoke-test.yml +++ b/.github/workflows/smoke-test.yml @@ -26,7 +26,9 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install hdf5 on mac if: ${{startsWith( matrix.os, 'macos' ) }} - run: brew install hdf5 + run: | + python -m pip install --upgrade pip + pip install h5py - name: Install dependencies run: | python -m pip install --upgrade pip