Resolved conflict by keeping local version of simWrapMoose.py

BhallaLab · Apr 2, 2024 · d0a6acc · d0a6acc
2 parents 88e8a09 + a3a6102
commit d0a6acc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/findsim.yml b/.github/workflows/findsim.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7]
+        python-version: [3.7,3.8,3.9,'3.10',3.11,3.12]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -36,12 +36,12 @@ jobs:
       - name: Install dependencies
         run: |
           export DEBIAN_FRONTEND=noninteractive
-          sudo -E apt install python3-tk python-tk
+          sudo -E apt install python3-tk
           python -m pip install numpy matplotlib --user
       # Runs a set of commands using the runners shell
       - name: Build
         run: |
-          python -m pip install pymoose --pre --upgrade
+          python -m pip install git+https://github.com/BhallaLab/moose-core.git
           python -m pip install jsonschema
       - name: Test scripts
         run: ./test.sh

diff --git a/test.sh b/test.sh
@@ -6,7 +6,7 @@ set -x
 # virtualenv does not require --user
 PYTHON=$(which python)
 
-$PYTHON findSim.py ./Curated/Jain2009_Fig3F.json --model models/synSynth7.g --map models/synSynth7_map.json
-$PYTHON findSim.py ./Curated/Bhalla1999_Fig2B.json --model models/synSynth7.g --map models/synSynth7_map.json
-$PYTHON findSim.py ./Curated/Gu2004_fig3B.json --model models/synSynth7.g --map models/synSynth7_map.json
-$PYTHON findSim.py ./Curated/Bhalla1999_Fig4C.json --model models/synSynth7.g --map models/synSynth7_map.json
+$PYTHON findSim.py ./Curated/Jain2009_Fig3F.json --model models/synSynth7.g --map models/synSynth7_map.json --solver LSODA
+$PYTHON findSim.py ./Curated/Bhalla1999_Fig2B.json --model models/synSynth7.g --map models/synSynth7_map.json --solver LSODA
+$PYTHON findSim.py ./Curated/Gu2004_fig3B.json --model models/synSynth7.g --map models/synSynth7_map.json --solver LSODA
+$PYTHON findSim.py ./Curated/Bhalla1999_Fig4C.json --model models/synSynth7.g --map models/synSynth7_map.json --solver LSODA