Merge pull request #56 from OpenSourceBrain/development

Fixes non omv tests
OpenSourceBrain · Sep 21, 2023 · 4cf57e7 · 4cf57e7
2 parents c2750f7 + e88a319
commit 4cf57e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/non-omv.yml b/.github/workflows/non-omv.yml
@@ -14,13 +14,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.7, 3.8 ]
+        python-version: [ 3.7, 3.8, 3.9 ]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python  ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version:  ${{ matrix.python-version }}
 
@@ -30,7 +30,7 @@ jobs:
 
     - name: Download some data
       run: |
-         pip install allensdk
+         pip install allensdk==2.15.2
 
          cd CellTypesDatabase/data
          python download.py -test
@@ -90,7 +90,7 @@ jobs:
          cd CellTypesDatabase/tune
          git clone https://github.com/NeuralEnsemble/neurotune.git
          cd neurotune/
-         python setup.py install
+         pip install .
          cd ..
          rm -rf neurotune
          export NEURON_HOME=$pythonLocation

diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml
@@ -13,15 +13,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.8 ]
+        python-version: [ 3.8, 3.9 ]
         engine: ["NEURON:8.1", "PyNEURON:8.1", "jNeuroML", "jNeuroML_NEURON", "jNeuroML_NetPyNE", "jNeuroML_validate"]
 
 
     steps:
     - uses: actions/checkout@v3
 
     - name: Set up Python  ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version:  ${{ matrix.python-version }}
 
@@ -31,6 +31,7 @@ jobs:
         pip install scipy sympy matplotlib cython pandas tables
 
     - name: Download selected NEURON models
+      if: ${{ contains( matrix.engine, 'NEURON' ) }}
       run: |
          pip install allensdk # for NEURON models
          cd CellTypesDatabase/models