Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for NeuroML v2.3.1 release #231

Merged
merged 41 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
4af9426
To v1.10.0 with NMLv2.3.1 schema
pgleeson Sep 22, 2023
225e953
feat: make `spikeThresh` required in `membraneProperties`
sanjayankur31 Apr 17, 2024
80629aa
Merge pull request #222 from NeuroML/fix/issue-220
pgleeson Apr 18, 2024
16a1310
Ensuring at least one <spikeThresh> on all <membraneProperties> elements
pgleeson Apr 18, 2024
9ff64ac
Update eden spike times to 0.2.3 behaviour
pgleeson Apr 19, 2024
2bb2950
chore: add spikeThresh
sanjayankur31 Apr 22, 2024
e4b8f71
chore: add spikeThresh
sanjayankur31 Apr 22, 2024
1a7f1e6
Merge branch 'development' into experimental
pgleeson Apr 24, 2024
5c2e0d9
Update GHA versions
pgleeson Apr 24, 2024
8c5b644
feat(core-types): add annotation component types
sanjayankur31 Apr 29, 2024
56a456b
ci: update actions to latest versions
sanjayankur31 Apr 29, 2024
12276e7
ci(eden): update tolerance for OMV test
sanjayankur31 Apr 29, 2024
96b5426
chore: tweak eden tolerance
sanjayankur31 Apr 29, 2024
953bc3f
chore: tweak tolerance for eden
sanjayankur31 Apr 29, 2024
2b6b31c
Merge pull request #226 from NeuroML/feat/gh-actions-update
sanjayankur31 Apr 29, 2024
584c45d
chore: revert eden changes
sanjayankur31 Apr 29, 2024
76e8b56
Merge branch 'development' into experimental
pgleeson May 1, 2024
98d2ffd
Test on java 21
pgleeson May 1, 2024
23fabbe
feat(annotations): update keywords
sanjayankur31 May 3, 2024
09f066d
feat(annotations): update combine specifications URL
sanjayankur31 May 3, 2024
ff2587f
feat(annotations): add remaining FOAF bits
sanjayankur31 May 3, 2024
1d248b3
Merge branch 'development' into feat/annotations
sanjayankur31 May 7, 2024
0895147
feat(annotations): use Child instead of Children
sanjayankur31 May 7, 2024
6a31539
Update GHA
pgleeson May 29, 2024
0ecce92
Update eden times for 0.2.3
pgleeson May 29, 2024
e3ccc41
Merge pull request #227 from NeuroML/update_gha
pgleeson May 29, 2024
caa8dd9
Merge branch 'development' into experimental
pgleeson May 29, 2024
c989b81
Merge branch 'development' into feat/annotations
pgleeson May 29, 2024
9044162
Merge branch 'feat/annotations' into experimental
pgleeson May 29, 2024
ed7b92b
Add soma_group, as it's referred to in channelDensity
pgleeson May 29, 2024
fe3aa27
Make membraneProperties require at least one each of specificCapacita…
pgleeson May 31, 2024
ab06e87
Add java 21
pgleeson Jun 11, 2024
f33c671
Merge branch 'development' into experimental
pgleeson Jun 11, 2024
7f048b0
To v1.10.1
pgleeson Jun 11, 2024
59bce36
Remove old travis.yml
pgleeson Jun 11, 2024
fef11a1
Merge pull request #228 from NeuroML/experimental
pgleeson Jun 11, 2024
29199e0
Add examples with tests for various ways to include <morphology> and …
pgleeson Jun 19, 2024
c92617c
Merge pull request #230 from NeuroML/experimental
pgleeson Jul 31, 2024
2e71514
Update history for v2.3.1 release
pgleeson Aug 13, 2024
00a3512
adopt -> temurin in actions file
pgleeson Aug 13, 2024
42f1581
Added more to history file
pgleeson Aug 20, 2024
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ name: Build all NML Java

on:
push:
branches: [ master, development, experimental, documentation_update, osb* ]
branches: [ master, development, experimental, documentation_update, osb*, update* ]
pull_request:
branches: [ master, development, experimental, documentation_update, osb* ]
branches: [ master, development, experimental, documentation_update, osb*, update* ]

jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
java: [ '8', '11', '16', '17', '19' ]
java: [ '8', '11', '16', '17', '19', '21' ]

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

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
java-package: jdk
distribution: 'adopt'
distribution: 'temurin'

- name: Install NeuroML 2 with Maven
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/omv-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Run OMV tests

on:
push:
branches: [ master, development, experimental, documentation_update, osb* ]
branches: [ master, development, experimental, documentation_update, osb*, update* ]
pull_request:
branches: [ master, development, experimental, documentation_update, osb* ]
branches: [ master, development, experimental, documentation_update, osb*, update* ]

jobs:
build:
Expand All @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ 3.9 ]
python-version: [ "3.9" ]
engine:
- jNeuroML
- jNeuroML_Brian2
Expand All @@ -25,10 +25,10 @@ jobs:
- PyLEMS_NeuroML2

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

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

Expand Down
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,15 @@ examples/*.pov
/LEMSexamples/tmp
arm64
/examples/NML2_SingleCompHHCell.nml__flattened.xml
/LEMSexamples/morphologies/*.mod
/LEMSexamples/morphologies/*.c
/LEMSexamples/morphologies/*.so
*eden.py
*netpyne.py
*nrn.py
/LEMSexamples/morphologies/*.dat
/LEMSexamples/morphologies/*.hoc
/LEMSexamples/morphologies/NET_m_in_b_in.net.nml
/LEMSexamples/morphologies/simulator.props
/LEMSexamples/morphologies/NET_m_in_b_out.net.nml
/LEMSexamples/morphologies/NET_m_out_b_in.net.nml
75 changes: 0 additions & 75 deletions .travis.yml

This file was deleted.

26 changes: 26 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,32 @@ and [LEMS](https://github.com/LEMS/LEMS), but also the Python ([libNeuroML](http

**Only contributors who are not [NeuroML Editors](https://docs.neuroml.org/NeuroMLOrg/Board.html) are specifically pointed out below.**

v2.3.1 / 2024-08-25
--------------------

* **Renamed the main Schema from NeuroML_v2.3.xsd to [NeuroML_v2.3.1.xsd](https://github.com/NeuroML/NeuroML2/blob/master/Schemas/NeuroML2/NeuroML_v2.3.1).**

* Adds support for external <morphology>/<biophysicalProperties> in cell element. Also simulator mappings for NEURON/NetPyNE support this. See [here](https://docs.neuroml.org/Userdocs/ImportingMorphologyFiles.html#neuroml2) for more details. Multiple examples of NeuroML2/LEMS files using this feature can be found [here](https://github.com/NeuroML/NeuroML2/tree/development/LEMSexamples/morphologies).

* pyNeuroML analysis feature updates: better support for analysing kinetic scheme based channels in `pynml-channelanalysis`; better support for plotting generated spike trains with `pynml-plotspikes`.

* Improved testing of Java based libraries on latest versions of Java and recent Mac OS versions.

* Improved support for adding RDF annotations to NeuroML files.

* Added ability to load (a subset of) XPPAUT files with `pynml-xpp` and export the model to LEMS or back to XPPAUT.

* Improvements to handling of SBML and SED-ML files - added to pynml ability to validate both formats, or run SED-ML files which refer to SBML models using simulator tellurium.

* Added option to archive NeuroML models as COMBINE Archives with `pynml-archive`.

* Initial support for sending archived NeuroML models to Biosimulations.org for simulation.

* Improved ability for pynml and related tools to detect the correct file type (NeuroML or LEMS) for the appropriate export/simulation option, and give advice when an incorrect file is provided.

* Updates to `pynml-plotmorph` for plotting morphologies in 2D, and in 3D with VisPy.


v2.3 / 2023-09-20
--------------------

Expand Down
17 changes: 17 additions & 0 deletions LEMSexamples/morphologies/.test.jnml.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_m_in_b_in.xml
engine: jNeuroML
mep: .test.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidal_soma_0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0.004018425953151025
20 changes: 20 additions & 0 deletions LEMSexamples/morphologies/.test.jnmleden.multi.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_pyrfull_in.xml
engine: jNeuroML_EDEN
mep: .test.multi.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidals_0.0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0.017719626168224333



20 changes: 20 additions & 0 deletions LEMSexamples/morphologies/.test.jnmleden.multi.out.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_pyrfull_out.xml
engine: jNeuroML_EDEN
mep: .test.multi.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidals_0.0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0.017719626168224333



17 changes: 17 additions & 0 deletions LEMSexamples/morphologies/.test.jnmleden.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_m_in_b_in.xml
engine: jNeuroML_EDEN
mep: .test.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidal_soma_0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0.0024858998690222445
17 changes: 17 additions & 0 deletions LEMSexamples/morphologies/.test.jnmleden.out.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_m_out_b_out.xml
engine: jNeuroML_EDEN
mep: .test.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidal_soma_0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0.0024858998690222445
20 changes: 20 additions & 0 deletions LEMSexamples/morphologies/.test.jnmlnetpyne.multi.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_pyrfull_in.xml
engine: jNeuroML_NetPyNE
mep: .test.multi.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidals_0.0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0



20 changes: 20 additions & 0 deletions LEMSexamples/morphologies/.test.jnmlnetpyne.multi.out.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_pyrfull_out.xml
engine: jNeuroML_NetPyNE
mep: .test.multi.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidals_0.0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0



20 changes: 20 additions & 0 deletions LEMSexamples/morphologies/.test.jnmlnetpyne.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_m_in_b_in.xml
engine: jNeuroML_NetPyNE
mep: .test.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidal_soma_0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0



20 changes: 20 additions & 0 deletions LEMSexamples/morphologies/.test.jnmlnetpyne.out.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_m_out_b_out.xml
engine: jNeuroML_NetPyNE
mep: .test.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidal_soma_0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0



20 changes: 20 additions & 0 deletions LEMSexamples/morphologies/.test.jnmlnrn.multi.omt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Script for running automated tests on OSB, see https://github.com/OpenSourceBrain/osb-model-validation

target: LEMS_pyrfull_in.xml
engine: jNeuroML_NEURON
mep: .test.multi.mep
experiments:
Current clamp pyramidal:
observables:
spike times:
file:
path: pyramidals_0.0.dat
columns: [0,1]
scaling: [1000, 1000]
spike detection:
method: threshold
threshold: 0
tolerance: 0



Loading