More tests

Author: Padraig Gleeson

.github/workflows/build-ci.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.8" ]
+        python-version: [ "3.8", "3.10" ]
 
     steps:
     - uses: actions/checkout@v2
@@ -33,6 +33,10 @@ jobs:
         git clone https://github.com/BhallaLab/moose-core.git
         cd moose-core
         git checkout master
+
+        pip install jupyter
+        pip install jupyter_packaging
+        pip install scipy
         
         python setup.py install
 
@@ -50,7 +54,7 @@ jobs:
         echo "Running simple file"
         python simple.py
 
-        echo "Running NeuroML file"
+        echo "Running NeuroML 2 file"
         python run_hhcell.py -nogui
 
 
@@ -60,8 +64,6 @@ jobs:
         omv all --engine=jNeuroML_Moose
 
 
-
-
     - name: Final version info
       run: |
-        pip list
+        omv list -V 

.github/workflows/ci_pip.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ 3.7, 3.9 ]
+        python-version: [ 3.7, 3.9, "3.10" ]
 
     steps:
     - uses: actions/checkout@v2
@@ -29,21 +29,24 @@ jobs:
       run: |
         pip install pymoose
         pip list
+        
     - name: Test Moose files
       run: |
         python tests/python/test_function.py
         #./test.sh
+
     - name: Test simple Moose file
       run: |
         cd NeuroML
         python -c "import moose; print(moose.__version__)"
         echo "Running simple file"
         python simple.py
 
-    - name: Test Moose files with NeuroML version 1
+
+    - name: Test Moose files with NeuroML version 2
       run: |
-        cd NeuroML/GranuleCell
-        # python Granule98.py -nogui ## No longer working..?
+        cd NeuroML
+        python run_hhcell.py -nogui
 
     - name: Final version info
       run: |

.github/workflows/ci_pre_pip.yml

@@ -25,20 +25,28 @@ jobs:
     - name: Install pyneuroml
       run: |
         pip install pyneuroml
+
     - name: Install Moose
       run: |
         pip install pymoose --pre
         pip list
+
     - name: Test Moose files
       run: |
         python tests/python/test_function.py
         #./test.sh
-    - name: Test Moose files with NeuroML version 1
+        
+    - name: Test simple Moose file
       run: |
         cd NeuroML
+        python -c "import moose; print(moose.__version__)"
+        echo "Running simple file"
         python simple.py
-        cd GranuleCell
-        python Granule98.py -nogui
+
+    - name: Test Moose files with NeuroML version 2
+      run: |
+        cd NeuroML
+        python run_hhcell.py -nogui
 
     - name: Install OMV
       run: |