Skip to content

Commit b28f4cd

Browse files
authored
Merge pull request #59 from ModECI/test_neuroml
Adds OMV tests for validating NeuroML
2 parents d4bbe40 + 1cec3bd commit b28f4cd

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

.github/workflows/ci.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ jobs:
6060
cd ../neuroml2
6161
python neuroml2_spec.py
6262
63-
pip install pyneuroml
64-
65-
# Requires: pip install pyneuroml
66-
pynml -validate hello_world_neuroml.net.nml
67-
pynml -validate TestNeuroML.xml
63+
# Note: NeuroML files will be validated with OMV below
6864
6965
- name: Run pytest
7066
run: |
@@ -78,7 +74,6 @@ jobs:
7874
cd examples
7975
python Example1.py
8076
81-
8277
- name: Install MDF
8378
run: |
8479
@@ -100,6 +95,20 @@ jobs:
10095
make clean
10196
make html
10297
98+
- name: Install and test with OMV
99+
if: ${{ matrix.runs-on != 'windows-latest' }}
100+
run: |
101+
# Note: OMV not well tested on Windows...
102+
103+
pip install git+https://github.com/OpenSourceBrain/osb-model-validation
104+
pip install scipy sympy matplotlib cython pandas tables
105+
106+
# Run OMV tests on all engines
107+
cd examples
108+
omv all -V
109+
110+
omv list -V # list installed engines
111+
103112
- name: Final version info
104113
run: |
105114
pip list

examples/neuroml2/.test.validate.omt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Script for running automated tests on OSB using Travis-CI, see https://github.com/OpenSourceBrain/osb-model-validation
2+
3+
# This test will validate NeuroML 2 files in the current directory using: jnml -validate *.nml
4+
target: "*.nml TestNeuroML.xml"
5+
engine: jNeuroML_validate

test_all.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ cd ../..
3131

3232
pytest tests -v
3333

34+
## Run OMV tests
35+
36+
omv all -V
37+
3438

3539
## Generate the docs
3640

@@ -42,4 +46,6 @@ make clean
4246
make html
4347
cd ..
4448

49+
## Format all file
50+
4551
pre-commit run --all-files

0 commit comments

Comments
 (0)