Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '8', '11', '16', '17', '19', '21' ]
java: [ '8', '11', '17', '19', '21', '25' ]

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.java }}
java-package: jdk
Expand All @@ -32,7 +32,8 @@ jobs:

- name: Install jNeuroML
run: |
export main_repo_branch=${GITHUB_REF##*/}
export main_repo_branch=${GITHUB_REF##*/}
if [[ ${main_repo_branch} == "osb_test_master" ]]; then main_repo_branch=master ; fi
if [[ ${main_repo_branch} != "master" && ${main_repo_branch} != "development" && ${main_repo_branch} != "experimental" && ${main_repo_branch} != *"osb"* ]]; then main_repo_branch=development ; fi
echo Using branch $main_repo_branch
git clone https://github.com/NeuroML/jNeuroML.git
Expand Down
24 changes: 18 additions & 6 deletions .github/workflows/omv-ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Run OMV tests

on:
schedule:
- cron: "1 1 27 * *"
push:
branches: [ master, development, experimental, documentation_update, osb*, update* ]
pull_request:
Expand All @@ -9,35 +11,45 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # for eden...
strategy:
fail-fast: false
matrix:
python-version: [ "3.9" ]
python-version: [ "3.10", "3.12" ]
engine:
- jNeuroML
- jNeuroML_Brian2
- jNeuroML_EDEN
- jNeuroML_NEURON
- jNeuroML_NetPyNE
- jNeuroML_MOOSE
- jNeuroML_validate
- PyLEMS_NeuroML2
# - jNeuroML_MOOSE # MOOSE disabled, due to latest version not supporting recording/plotting of channel variables, as used in ex5
exclude:
- python-version: "3.12"
engine: jNeuroML_MOOSE # MOOSE not yet working on py 3.12...
- python-version: "3.10"
engine: jNeuroML_Brian2 # Brian latest no longer working on py <3.12...

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

- name: Install numpy < 2 if necessary...
run: |
if [[ ${{ matrix.engine }} == *"MOOSE"* ]] || [[ ${{ matrix.engine }} == *"Moose"* ]]; then pip install "numpy<2" ; fi ;
pip list

- name: Install OMV
run: |
pip install git+https://github.com/OpenSourceBrain/osb-model-validation
pip install scipy sympy matplotlib cython pandas tables
pip install setuptools==80 # needed for Eden on py >=3.12

pip install 'numpy<=1.23.0' # see https://github.com/OpenSourceBrain/osb-model-validation/issues/91


- name: Run OMV tests on engine ${{ matrix.engine }}
Expand Down