Merge pull request #114 from openworm/development

pgleeson · web-flow · commit e23559c55b6a · 2025-07-29T13:39:13.000+01:00
Test on py3.13 also
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.9, "3.11" ]
+        python-version: [ "3.10", "3.13" ]
         engine: [ jNeuroML, jNeuroML_NEURON, jNeuroML_validate ] #, NON_OMV_TESTS ]
 
     steps:
diff --git a/.github/workflows/non_omv.yml b/.github/workflows/non_omv.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:        
         runs-on: [ubuntu-latest, macos-13, macos-latest ]
-        python-version: [ 3.9, "3.10", "3.11", "3.12" ]
+        python-version: [ "3.10", "3.12", "3.13" ]
         exclude:
           - runs-on: macos-latest
             python-version: "3.8"
diff --git a/c302/runAndPlot.py b/c302/runAndPlot.py
@@ -164,14 +164,27 @@ def run_c302(
             "FW",
             "C2",
             "",
-            5000,
+            500,
             0.05,
             "jNeuroML_NEURON",
             data_reader=c302.FW_DATA_READER,
             save=True,
             show_plot_already=True,
         )
 
+    elif "-fwW2d" in sys.argv:
+        run_c302(
+            "FW",
+            "W2D",
+            "",
+            50,
+            0.05,
+            "jNeuroML",
+            data_reader=c302.FW_DATA_READER,
+            save=True,
+            show_plot_already=True,
+        )
+
     elif "-fullC2" in sys.argv:
         run_c302("Full", "C2", "", 1000, 0.05, "jNeuroML_NEURON")
 
@@ -343,6 +356,8 @@ def run_c302(
         run_c302("IClamp", "B", "", 6000, 0.05, "jNeuroML")
     elif "-iC0" in sys.argv:
         run_c302("IClamp", "C0", "", 6000, 0.05, "jNeuroML")
+    elif "-iC0n" in sys.argv:
+        run_c302("IClamp", "C0", "", 6000, 0.05, "jNeuroML_NEURON")
     elif "-iC" in sys.argv:
         run_c302("IClamp", "C", "", 6000, 0.05, "jNeuroML")
     elif "-iC1" in sys.argv:
diff --git a/examples/LEMS_c302_W2D_Full.xml b/examples/LEMS_c302_W2D_Full.xml
@@ -6,7 +6,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/LEMS_c302_W2D_Muscles.xml b/examples/LEMS_c302_W2D_Muscles.xml
@@ -6,7 +6,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/LEMS_c302_W2D_Oscillator.xml b/examples/LEMS_c302_W2D_Oscillator.xml
@@ -6,7 +6,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/LEMS_c302_W2D_Pharyngeal.xml b/examples/LEMS_c302_W2D_Pharyngeal.xml
@@ -6,7 +6,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/LEMS_c302_W2D_Social.xml b/examples/LEMS_c302_W2D_Social.xml
@@ -6,7 +6,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/LEMS_c302_W2D_Syns.xml b/examples/LEMS_c302_W2D_Syns.xml
@@ -6,7 +6,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/c302_W2D_Full.net.nml b/examples/c302_W2D_Full.net.nml
@@ -4,7 +4,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/c302_W2D_Muscles.net.nml b/examples/c302_W2D_Muscles.net.nml
@@ -4,7 +4,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/c302_W2D_Oscillator.net.nml b/examples/c302_W2D_Oscillator.net.nml
@@ -4,7 +4,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/c302_W2D_Pharyngeal.net.nml b/examples/c302_W2D_Pharyngeal.net.nml
@@ -4,7 +4,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/c302_W2D_Social.net.nml b/examples/c302_W2D_Social.net.nml
@@ -4,7 +4,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/examples/c302_W2D_Syns.net.nml b/examples/c302_W2D_Syns.net.nml
@@ -4,7 +4,7 @@
 Parameters and setting used to generate this network:
 
     Data reader:                    cect.SpreadsheetDataReader
-    c302 version:                   0.10.0
+    c302 version:                   0.10.1
     cect version:                   0.2.5
     owmeta version:                 - not installed -
     owmeta_core version:            - not installed -
diff --git a/test.sh b/test.sh
@@ -158,7 +158,7 @@ cd ../..
 
 ## Try helper scripts
 
-python -m c302.runAndPlot -test
+python -m c302.runAndPlot -test # run: python -m c302.runAndPlot -all, to regenerate all images in examples/summary/images/
 
 python -m c302.c302_utils -nogui
 
