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
7 changes: 4 additions & 3 deletions .github/workflows/non-omv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ 3.9, "3.10" ]
python-version: [ 3.9, "3.12" ]
runs-on: [ ubuntu-latest, macos-latest ]

steps:
Expand All @@ -33,15 +33,16 @@ jobs:
run: |
pip install git+https://github.com/OpenSourceBrain/osb-model-validation
pip install scipy sympy matplotlib cython pandas tables

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


- name: Regenerate and test
run: |
omv install neuron
omv install netpyne
omv install pyNeuroML

pip list

export NEURON_HOME=$pythonLocation

omv list -V
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/omv-ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Continuous builds

on:
schedule:
- cron: "1 1 10 */1 *" # Run once a month to test...
push:
branches: [ master, development, experimental ]
pull_request:
Expand All @@ -9,11 +11,11 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04 # for eden...
strategy:
fail-fast: false
matrix:
python-version: [ 3.8, 3.9, "3.10" ]
python-version: [ 3.9, "3.10", "3.12" ]
engine: [ NetPyNE, jNeuroML, jNeuroML_NEURON, jNeuroML_NetPyNE, jNeuroML_EDEN, jNeuroML_validate ]

steps:
Expand All @@ -23,12 +25,17 @@ jobs:
with:
python-version: ${{ matrix.python-version }}


- name: Ensure setuptools is up-to-date
run: |
pip install --upgrade setuptools

- name: Install OMV
run: |
pip install git+https://github.com/OpenSourceBrain/osb-model-validation

pip install scipy sympy matplotlib cython pandas tables

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

- name: Run OMV tests on engine ${{ matrix.engine }}
run: |
Expand Down
49 changes: 0 additions & 49 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions NetPyNE/ACnet/AMPA_syn.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=AMPA_syn type=expTwoSynapse)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/AMPA_syn_inh.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=AMPA_syn_inh type=expTwoSynapse)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/BackgroundRandomIClamps.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=BackgroundRandomIClamps type=pulseGen
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/Ca_conc.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=Ca_conc type=fixedFactorConcentration
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/Ca_pyr.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=Ca_pyr type=ionChannelHH)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/GABA_syn.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=GABA_syn type=expTwoSynapse)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/GABA_syn_inh.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=GABA_syn_inh type=expTwoSynapse)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/Kahp_pyr.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=Kahp_pyr type=ionChannelHH)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/Kdr_bask.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=Kdr_bask type=ionChannelHH)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/Kdr_pyr.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=Kdr_pyr type=ionChannelHH)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
8 changes: 4 additions & 4 deletions NetPyNE/ACnet/LEMS_MediumNet_netpyne.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@


This NETPYNE file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

'''
# Main NetPyNE script for: network_ACnet2
Expand Down Expand Up @@ -69,7 +69,7 @@ def __init__(self, tstop=500.0, dt=0.01, seed=123456789, save_json=False, abs_to
self.report_file.write('SimulationFile=%s\n'%__file__)
self.report_file.write('PythonVersion=%s\n'%sys.version.replace('\n',' '))
self.report_file.write('NeuronVersion=%s\n'%h.nrnversion())
self.report_file.write('NeuroMLExportVersion=1.10.1\n')
self.report_file.write('NeuroMLExportVersion=1.11.0\n')
self.report_file.close()


Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/LeakConductance_bask.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=LeakConductance_bask type=ionChannelP
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/LeakConductance_pyr.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=LeakConductance_pyr type=ionChannelPa
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/Na_bask.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=Na_bask type=ionChannelHH)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/ACnet/Na_pyr.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=Na_pyr type=ionChannelHH)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
8 changes: 4 additions & 4 deletions NetPyNE/GapJunctions/LEMS_GJ_netpyne.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@


This NETPYNE file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

'''
# Main NetPyNE script for: net1
Expand Down Expand Up @@ -43,7 +43,7 @@ def __init__(self, tstop=700.0, dt=0.01, seed=123456789, save_json=False, abs_to
self.report_file.write('SimulationFile=%s\n'%__file__)
self.report_file.write('PythonVersion=%s\n'%sys.version.replace('\n',' '))
self.report_file.write('NeuronVersion=%s\n'%h.nrnversion())
self.report_file.write('NeuroMLExportVersion=1.10.1\n')
self.report_file.write('NeuroMLExportVersion=1.11.0\n')
self.report_file.close()


Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/GapJunctions/gj1.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=gj1 type=gapJunction)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/GapJunctions/iaf.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=iaf type=iafCell)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/GapJunctions/pulseGen1.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=pulseGen1 type=pulseGenerator)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
6 changes: 3 additions & 3 deletions NetPyNE/GapJunctions/pulseGen2.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=pulseGen2 type=pulseGenerator)
COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.10.1
org.neuroml.model v1.10.1
jLEMS v0.11.1
org.neuroml.export v1.11.0
org.neuroml.model v1.11.0
jLEMS v0.12.0

ENDCOMMENT

Expand Down
Loading