Merge pull request #12 from OpenSourceBrain/development

Tests with netpyne format

Author: pgleeson

.github/workflows/non-omv.yml

@@ -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:
@@ -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

.github/workflows/omv-ci.yml

@@ -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:
@@ -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:
@@ -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: |

.travis.yml

@@ -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
 

NetPyNE/ACnet/AMPA_syn.mod

@@ -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
 

NetPyNE/ACnet/AMPA_syn_inh.mod

@@ -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
 

NetPyNE/ACnet/BackgroundRandomIClamps.mod

@@ -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
 

NetPyNE/ACnet/Ca_conc.mod

@@ -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
 

NetPyNE/ACnet/Ca_pyr.mod

@@ -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
 

NetPyNE/ACnet/GABA_syn.mod

@@ -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