Skip to content
Open
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
14 changes: 14 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Source - https://stackoverflow.com/a/78380165
# Posted by Stefan, modified by community. See post 'Timeline' for change history
# Retrieved 2026-04-14, License - CC BY-SA 4.0

# Set update schedule for GitHub Actions

version: 2
updates:

- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Continuous builds

on:
push:
branches: [ master, development, experimental, modelspec ]
branches: [ master, development, experimental, modelspec, test* ]
pull_request:
branches: [ master, development, experimental, modelspec ]
branches: [ master, development, experimental, modelspec, test* ]

jobs:
build:
Expand All @@ -13,15 +13,15 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.10", "3.11", "3.12", "3.13"]
python-version: ["3.10", "3.11", "3.12", "3.13"] #, "3.14" # Neuron not yet supported on 3.14 (need nrn<9.0)
env:
JNML_HOME: "/home/runner/work/NeuroMLlite/NeuroMLlite/jNeuroML"
HDF5_DISABLE_VERSION_CHECK: 1

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Set up Python
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version: '3.x'
- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion docs/NeuroMLlite_specification.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"specification": {
"Network": {
"definition": "A Network containing multiple Population's, connected by Projection's and receiving Input's",
Expand Down
2 changes: 1 addition & 1 deletion docs/NeuroMLlite_specification.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: NeuroMLlite v0.6.1
version: NeuroMLlite v0.6.2
specification:
Network:
definition: A Network containing multiple Population's, connected by Projection's
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Specification of NeuroMLlite v0.6.1
# Specification of NeuroMLlite v0.6.2
**Note: the NeuroMLlite specification is still in development! Subject to change...**

## Network
Expand Down
2 changes: 1 addition & 1 deletion examples/BBP_5percent.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"BBP_5percent": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "A network with the Blue Brain Project connectivity data (%s% of total cells)",
"cells": {
"hhcell": {
Expand Down
2 changes: 1 addition & 1 deletion examples/Example10_Lorenz.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example10_Lorenz": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example 10: Lorenz",
"parameters": {
"N": 1,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example11_Synapses.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example11_Synapses": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example 11: synaptic properties",
"parameters": {
"input_amp": 0.23,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example11_Synapses.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Example11_Synapses">
<notes>Generated by NeuroMLlite v0.6.1
<notes>Generated by NeuroMLlite v0.6.2
Generated network: Example11_Synapses
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example12_MultiComp.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example12_MultiComp": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example 12: Multicompartmental cells...",
"parameters": {
"N": 20,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example1_TestNetwork.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"TestNetwork": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "A simple network with 2 populations & projection between them. No info yet on what the cells are so network can't be simulated.",
"populations": {
"pop0": {
Expand Down
2 changes: 1 addition & 1 deletion examples/Example2_TestNetwork.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example2_TestNetwork": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "A simple network with 2 populations & projection between them. Cells are specified to be NeuroML 2 HH cell models & pre population is given a spiking input.",
"cells": {
"hhcell": {
Expand Down
2 changes: 1 addition & 1 deletion examples/Example2_TestNetwork.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Example2_TestNetwork">
<notes>Generated by NeuroMLlite v0.6.1
<notes>Generated by NeuroMLlite v0.6.2
Generated network: Example2_TestNetwork
Generation seed: 1234</notes>
<include href="test_files/inputs.nml"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/Example3_Network.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example3_Network": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example 3: simple network with 2 populations of NeuroML2 cells, a projection between them and spiking input.",
"cells": {
"hhcell": {
Expand Down
2 changes: 1 addition & 1 deletion examples/Example3_Network.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Example3_Network">
<notes>Generated by NeuroMLlite v0.6.1
<notes>Generated by NeuroMLlite v0.6.2
Generated network: Example3_Network
Generation seed: 1234</notes>
<include href="test_files/inputs.nml"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/Example4_PyNN.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example4_PyNN": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example 4: a network with PyNN cells & inputs",
"parameters": {
"input_amp": 0.99
Expand Down
2 changes: 1 addition & 1 deletion examples/Example4_PyNN.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Example4_PyNN">
<notes>Generated by NeuroMLlite v0.6.1
<notes>Generated by NeuroMLlite v0.6.2
Generated network: Example4_PyNN
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example4_PyNN.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Example4_PyNN:
version: NeuroMLlite v0.6.1
version: NeuroMLlite v0.6.2
notes: 'Example 4: a network with PyNN cells & inputs'
parameters:
input_amp: 0.99
Expand Down
2 changes: 1 addition & 1 deletion examples/Example6_PyNN.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example6_PyNN": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Another network for PyNN - work in progress...",
"parameters": {
"N_scaling": 0.005,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example6_PyNN.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Example6_PyNN">
<notes>Generated by NeuroMLlite v0.6.1
<notes>Generated by NeuroMLlite v0.6.2
Generated network: Example6_PyNN
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example6_PyNN_noinputs.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example6_PyNN_noinputs": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Another network for PyNN - work in progress...",
"parameters": {
"N_scaling": 0.005,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example6_PyNN_noinputs.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Example6_PyNN_noinputs">
<notes>Generated by NeuroMLlite v0.6.1
<notes>Generated by NeuroMLlite v0.6.2
Generated network: Example6_PyNN_noinputs
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example7_Brunel2000.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example7_Brunel2000": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example 7: based on network of Brunel 2000",
"parameters": {
"g": 4,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example7_Brunel2000.net.nml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<neuroml xmlns="http://www.neuroml.org/schema/neuroml2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Example7_Brunel2000">
<notes>Generated by NeuroMLlite v0.6.1
<notes>Generated by NeuroMLlite v0.6.2
Generated network: Example7_Brunel2000
Generation seed: 1234
NeuroMLlite parameters:
Expand Down
2 changes: 1 addition & 1 deletion examples/Example8_Extension.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example8_Extension": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example 8: general testing...",
"parameters": {
"N": 10,
Expand Down
2 changes: 1 addition & 1 deletion examples/Example9_HindmarshRose.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Example9_HindmarshRose": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example 9: HindmarshRose",
"parameters": {
"N": 1,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample10.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample10": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Example10_Lorenz.json",
"duration": 10000.0,
"dt": 1.0,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample11.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample11": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Example11_Synapses.json",
"duration": 1000.0,
"dt": 0.01,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample12_MultiComp.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample12_MultiComp": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Example12_MultiComp.json",
"duration": 1000.0,
"dt": 0.025,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample3.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample3": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Example3_Network.json",
"duration": 1000.0,
"dt": 0.025,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample4.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample4": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Example4_PyNN.json",
"duration": 1000.0,
"dt": 0.01,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample4.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SimExample4:
version: NeuroMLlite v0.6.1
version: NeuroMLlite v0.6.2
network: Example4_PyNN.yaml
duration: 1000.0
dt: 0.01
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample6_PyNN.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample6_PyNN": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Example6_PyNN.json",
"duration": 100.0,
"dt": 0.025,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample7.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample7": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Example7_Brunel2000.json",
"duration": 1000.0,
"dt": 0.025,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample8.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample8": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Example8_Extension.json",
"duration": 1000.0,
"dt": 0.025,
Expand Down
2 changes: 1 addition & 1 deletion examples/SimExample9.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimExample9": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Example9_HindmarshRose.json",
"duration": 1000000.0,
"dt": 25.0,
Expand Down
2 changes: 1 addition & 1 deletion examples/arbor/ArborExample.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"ArborExample": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example for testing Arbor",
"parameters": {
"v_init": -50,
Expand Down
2 changes: 1 addition & 1 deletion examples/arbor/ArborExample.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ArborExample:
version: NeuroMLlite v0.6.1
version: NeuroMLlite v0.6.2
notes: Example for testing Arbor
parameters:
v_init: -50
Expand Down
2 changes: 1 addition & 1 deletion examples/arbor/SimArborExample.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimArborExample": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "ArborExample.json",
"duration": 100.0,
"dt": 0.01,
Expand Down
2 changes: 1 addition & 1 deletion examples/arbor/SimArborExample.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SimArborExample:
version: NeuroMLlite v0.6.1
version: NeuroMLlite v0.6.2
network: ArborExample.yaml
duration: 100.0
dt: 0.01
Expand Down
2 changes: 1 addition & 1 deletion examples/spikeratetest/SimSpikers.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"SimSpikers": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"network": "Spikers.json",
"duration": 10000.0,
"dt": 0.025,
Expand Down
2 changes: 1 addition & 1 deletion examples/spikeratetest/Spikers.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Spikers": {
"version": "NeuroMLlite v0.6.1",
"version": "NeuroMLlite v0.6.2",
"notes": "Example with spiking entities..",
"parameters": {
"N": 10,
Expand Down
5 changes: 2 additions & 3 deletions neuromllite/GraphVizHandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ def handle_population(
else:
fcolor = "#ffffff"

print_v('Color %s -> %s -> %s'%(properties['color'], rgb, color))
print_v("Color %s -> %s -> %s" % (properties["color"], rgb, color))

if properties and "type" in properties:
self.pop_types[population_id] = properties["type"]
Expand Down Expand Up @@ -634,7 +634,6 @@ def handle_projection(
self.proj_post_pops[projName] = postPop
self.proj_types[projName] = type


if type == "continuousProjection":
shape = self.CONT_CONN_ARROW_SHAPE
line = "solid"
Expand All @@ -646,7 +645,7 @@ def handle_projection(
if type == "electricalProjection":
shape = self.GAP_CONN_ARROW_SHAPE
line = "dashed"

if synapse_obj:
self.proj_syn_objs[projName] = synapse_obj
erev = self.get_reversal_potential_mV(synapse_obj)
Expand Down
2 changes: 1 addition & 1 deletion neuromllite/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import collections

__version__ = "0.6.1"
__version__ = "0.6.2"

# import pyNN
# import nest
Expand Down