Skip to content

Commit 4244874

Browse files
committed
Merge branch 'development' into experimental
2 parents 08c907f + fa0d6e9 commit 4244874

3 files changed

Lines changed: 12 additions & 64 deletions

File tree

.github/workflows/omv-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
python-version: [ "3.10", "3.12", "3.13" ] # Brian no longer supported on py3.9!
16+
python-version: [ "3.12", "3.13" ] # Brian no longer supported on py3.10!
1717
engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_PyNN_NEURON, jNeuroML_validate, PyNN_NEURON, PyNN_Nest, PyNN_NeuroML, PyNN_Brian2]
1818

1919
steps:
@@ -32,6 +32,7 @@ jobs:
3232
run: |
3333
3434
pip install matplotlib "cython<3.1.0" # let omv handle other deps...
35+
pip install 'numpy==2.2.6' # to test against older numpy versions... TODO: remove when pynn v0.12 used!
3536
3637
pip list
3738

.travis.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

NeuroML2/ConnectionsTest.net.nml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,38 @@
1717
<property tag="radius" value="5"/>
1818
<property tag="color" value="0 0.6 0"/>
1919
<instance id="0">
20-
<location x="79.365507043716349" y="-57.418744412173872" z="6.327464195881949"/>
20+
<location x="-42.699924151852066" y="4.729036955047805" z="-9.873618042704768"/>
2121
</instance>
2222
<instance id="1">
23-
<location x="-28.890149335036909" y="-91.606168707361761" z="23.64437377165174"/>
23+
<location x="78.938113344951091" y="26.315870763800774" z="-35.038791824720562"/>
2424
</instance>
2525
<instance id="2">
26-
<location x="41.233368233403091" y="-6.260075264492881" z="3.521220797352886"/>
26+
<location x="27.794170010388306" y="-7.853030988231846" z="-94.727877190272736"/>
2727
</instance>
2828
<instance id="3">
29-
<location x="-40.977962589409245" y="61.457364222708911" z="-17.132517924163992"/>
29+
<location x="-39.634051807222725" y="-35.968340524988939" z="-26.74170281006225"/>
3030
</instance>
3131
<instance id="4">
32-
<location x="-47.349217408708896" y="47.814712269639827" z="-25.177784417656479"/>
32+
<location x="-9.410736121125884" y="26.358765985691068" z="-75.199647589865521"/>
3333
</instance>
3434
</population>
3535
<population id="pop_post" component="IF_cond_alpha_pop_post" size="5" type="populationList">
3636
<property tag="radius" value="5"/>
3737
<property tag="color" value="0 0.2 0.6"/>
3838
<instance id="0">
39-
<location x="-62.576074219329158" y="163.478746009432029" z="-30.431672339435067"/>
39+
<location x="-30.217914865204222" y="179.402262884693499" z="-41.905807576937626"/>
4040
</instance>
4141
<instance id="1">
42-
<location x="-28.701030924649572" y="206.74054774641732" z="53.770518629103513"/>
42+
<location x="13.540511756095786" y="278.225681490259603" z="22.329670872029219"/>
4343
</instance>
4444
<instance id="2">
45-
<location x="65.2563649778875" y="170.159307155336876" z="-48.68674404894626"/>
45+
<location x="21.400564508691922" y="249.419490876899118" z="39.145972615350487"/>
4646
</instance>
4747
<instance id="3">
48-
<location x="86.000661309460043" y="164.200170454466104" z="7.389655689865582"/>
48+
<location x="-23.828897288424212" y="172.144757981330031" z="-69.797540774751937"/>
4949
</instance>
5050
<instance id="4">
51-
<location x="-35.067232700877128" y="167.120938353845503" z="-1.174744711330211"/>
51+
<location x="44.702013145387063" y="200.054255688881625" z="-55.904848619413471"/>
5252
</instance>
5353
</population>
5454
<projection id="pop_pre__TO__pop_post" presynapticPopulation="pop_pre" postsynapticPopulation="pop_post" synapse="syn__pop_pre__TO__pop_post">

0 commit comments

Comments
 (0)