Merge branch 'development' into feat-use-jnml-from-pyneuroml

Author: sanjayankur31

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.10" ]
+        python-version: [ "3.11" ] 
         engine:
           - Arbor
           - "Brian2:2.9.0"
@@ -39,7 +39,7 @@ jobs:
           - "jNeuroML:v0.12.3"
           - jNeuroML_Brian2
           - jNeuroML_EDEN
-          - "jNeuroML_NEURON:8.2.1"
+          - "jNeuroML_NEURON:8.2.7"
           - jNeuroML_NetPyNE
           - jNeuroML_PyNN_NEURON
           - jNeuroML_validate
@@ -67,6 +67,11 @@ jobs:
         #sudo apt install octave
         sudo apt-get install -y subversion # for neuroConstruct full install...
 
+    - name: Install numpy < 2 if necessary...
+      run: |
+        if [[  ${{ matrix.engine }} == *"MOOSE"* ]] || [[  ${{ matrix.engine }} == *"Moose"* ]]; then pip install "numpy<2" ; fi ;
+        pip list
+
     - name: Run OMV tests on engine ${{ matrix.engine }}
       run: |
         # Not yet checked: Octave, genesis

.github/workflows/ci_versions.yml

@@ -1,6 +1,8 @@
 name: Test across versions
 
 on:
+  schedule:
+    - cron: "1 1 15 */1 *"  # Run once a month to test...
   push:
     branches: [ master, development, experimental, test* ]
   pull_request:
@@ -13,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
-        runs-on: [ubuntu-latest, macos-latest, ubuntu-24.04 ]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        runs-on: [ubuntu-latest, macos-latest ]
         exclude:
           - runs-on: macos-latest
             python-version: ["3.9"]

omv/engines/getmoose.py

@@ -3,7 +3,7 @@
 
 def install_moose(version):
     if not version:
-        version = "4.0.0"
+        version = "4.0.0.dev20240411"
     try:
         pip_install("pymoose", version)
         import moose

omv/engines/getnrn.py

@@ -10,7 +10,7 @@
 def install_neuron(version):
     if not version:
         if sys.version_info.major == 3:
-            version = "8.2.6"  # for pynn 0.11.0
+            version = "8.2.7"  # for pynn 0.11.0
         else:
             version = "7.6"
 

omv/engines/neuron_.py

@@ -85,6 +85,7 @@ def is_installed():
             inform("Checking whether %s is installed..." % NeuronEngine.name, indent=1)
         try:
             output = check_output(["nrniv", "--version"], verbosity=2)
+            output = output[output.index('NEURON'):]
             if is_verbose():
                 inform(
                     "%s is installed; env: %s"

omv/omv_util.py

@@ -154,8 +154,8 @@ def main():
             ]:
                 installed_ver = False
                 try:
-                    exec("import %s" % m)
-                    installed_ver = "v%s" % eval("%s.__version__" % m)
+                    mod = __import__(m)
+                    installed_ver = "v%s" % getattr(mod, "__version__", "unknown")
                 except Exception:
                     pass
                 inform(