Merge branch 'main' into experimental

OpenSourceBrain · Apr 9, 2024 · a22882b · a22882b
2 parents 557c98a + 281de79
commit a22882b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml
@@ -14,15 +14,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_EDEN, "jNeuroML_EDEN:0.2.2", jNeuroML_validate, EDEN, "EDEN:0.2.1"]
-        runs-on: [ ubuntu-latest, macos-latest,  macos-11 ]
-        python-version: [ 3.9 ]
+        runs-on: [ ubuntu-latest, macos-14 ]
+        engine:
+            - jNeuroML
+            - jNeuroML_NEURON
+            - jNeuroML_EDEN
+            - "jNeuroML_EDEN:0.2.3"
+            - jNeuroML_validate
+            - "EDEN:0.2.0"
+            - "EDEN:0.2.2"
+            - "EDEN:0.2.3"
 
+        python-version: [ "3.10" ]
+
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python  ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version:  ${{ matrix.python-version }}
 
@@ -39,3 +48,4 @@ jobs:
       run: |
         omv list -V # list installed engines
         pip list
+        env
diff --git a/.github/workflows/pip-install.yml b/.github/workflows/pip-install.yml
@@ -17,9 +17,9 @@ jobs:
         runs-on: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

diff --git a/NeuroML2/.test.2007.jnmleden.omt b/NeuroML2/.test.2007.jnmleden.omt
@@ -14,4 +14,4 @@ experiments:
         spike detection:
           method: threshold
           threshold: 0
-        tolerance: 0.000
+        tolerance: 3.667537832120739e-08  # due to slight difference on mac/linux of eden...
diff --git a/NeuroML2/.test.eden.omt b/NeuroML2/.test.eden.omt
@@ -12,4 +12,4 @@ experiments:
         spike detection:
           method: threshold
           threshold: 0
-        tolerance: 0
+        tolerance: 3.667537832120739e-08  # due to slight difference on mac/linux of eden...
diff --git a/NeuroML2/.test.ex5.eden.omt b/NeuroML2/.test.ex5.eden.omt
@@ -14,7 +14,7 @@ experiments:
         spike detection: 
           method: threshold
           threshold: 0
-        tolerance: 0.00350330618543931
+        tolerance: 0.0035033174501254887
   m:
     observables:
       spike times: