From 81ecb25ad0fd24c6fee0c934da352da5db4fd383 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 29 Jul 2025 11:17:52 +0100 Subject: [PATCH 1/5] Test on macos-15 --- .github/workflows/ci_versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_versions.yml b/.github/workflows/ci_versions.yml index 5345fcc..cef0f97 100644 --- a/.github/workflows/ci_versions.yml +++ b/.github/workflows/ci_versions.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] - runs-on: [ubuntu-latest, macos-latest ] + runs-on: [ubuntu-latest, macos-latest, macos-15 ] exclude: - runs-on: macos-latest python-version: ["3.9"] From 41739e733e262b75435a8e410f9df4eb85e67161 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 6 Jan 2026 14:09:41 +0000 Subject: [PATCH 2/5] Test pinning numpy < 2.4 --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a56bb74..f2d2538 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,9 +67,12 @@ jobs: #sudo apt install octave sudo apt-get install -y subversion # for neuroConstruct full install... - - name: Install numpy < 2 if necessary... + - name: Install numpy < 2 (or <2.4) if necessary... run: | + pip install "numpy<2.4" # See https://github.com/OpenSourceBrain/osb-model-validation/issues/150 + if [[ ${{ matrix.engine }} == *"MOOSE"* ]] || [[ ${{ matrix.engine }} == *"Moose"* ]]; then pip install "numpy<2" ; fi ; + pip list - name: Run OMV tests on engine ${{ matrix.engine }} From e0c72baf4480f6e17a47306323ce9ef2ba3a20e6 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 6 Jan 2026 17:29:36 +0000 Subject: [PATCH 3/5] Test macos-14 as latest is 15 --- .github/workflows/ci_versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_versions.yml b/.github/workflows/ci_versions.yml index a935b04..33c9486 100644 --- a/.github/workflows/ci_versions.yml +++ b/.github/workflows/ci_versions.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] - runs-on: [ubuntu-latest, macos-latest, macos-15 ] + runs-on: [ubuntu-latest, macos-14, macos-latest ] exclude: - runs-on: macos-latest python-version: "3.9" From 4d7c5860d502c720a0865ebd885580f56001f697 Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 6 Jan 2026 17:46:02 +0000 Subject: [PATCH 4/5] Correct exclusion --- .github/workflows/ci.yml | 2 +- .github/workflows/ci_versions.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2d2538..6e001e7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: - name: Install numpy < 2 (or <2.4) if necessary... run: | - pip install "numpy<2.4" # See https://github.com/OpenSourceBrain/osb-model-validation/issues/150 + pip install "numpy<2.4" # Issue with numpy 2.4 and quantities, see https://github.com/OpenSourceBrain/osb-model-validation/issues/150 if [[ ${{ matrix.engine }} == *"MOOSE"* ]] || [[ ${{ matrix.engine }} == *"Moose"* ]]; then pip install "numpy<2" ; fi ; diff --git a/.github/workflows/ci_versions.yml b/.github/workflows/ci_versions.yml index 33c9486..fb50eab 100644 --- a/.github/workflows/ci_versions.yml +++ b/.github/workflows/ci_versions.yml @@ -18,7 +18,7 @@ jobs: python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] runs-on: [ubuntu-latest, macos-14, macos-latest ] exclude: - - runs-on: macos-latest + - runs-on: macos-14 python-version: "3.9" steps: From 35a37da03b11fa497206e5ebef5112be932486af Mon Sep 17 00:00:00 2001 From: Padraig Gleeson Date: Tue, 6 Jan 2026 18:03:52 +0000 Subject: [PATCH 5/5] More exclusions --- .github/workflows/ci_versions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_versions.yml b/.github/workflows/ci_versions.yml index fb50eab..f733cef 100644 --- a/.github/workflows/ci_versions.yml +++ b/.github/workflows/ci_versions.yml @@ -20,6 +20,8 @@ jobs: exclude: - runs-on: macos-14 python-version: "3.9" + - runs-on: macos-latest + python-version: "3.9" steps: - uses: actions/checkout@v4