Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.11" ]
python-version: [ "3.12" ]
engine:
- Arbor
- "Brian2:2.9.0"
Expand Down Expand Up @@ -49,14 +49,14 @@ jobs:
- pyNeuroML
- pyNeuroML_validate_sbml
- pyNEURON_XPP_LEMS
- jNeuroML_Moose
- MOOSE:3.1.5
- XPP
# - jNeuroML_Moose # not yet working on py3.12

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -67,10 +67,11 @@ jobs:
#sudo apt install octave
sudo apt-get install -y subversion # for neuroConstruct full install...

- name: Install numpy < 2 (or <2.4) if necessary...
run: |
pip install "numpy<2.4" # Issue with numpy 2.4 and quantities, see https://github.com/OpenSourceBrain/osb-model-validation/issues/150
pip install setuptools==80 # needed for eden on Python 3.12...

- name: Install numpy < 2 if necessary...
run: |

if [[ ${{ matrix.engine }} == *"MOOSE"* ]] || [[ ${{ matrix.engine }} == *"Moose"* ]]; then pip install "numpy<2" ; fi ;

pip list
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.x"
- name: Install pypa/build
Expand Down
2 changes: 1 addition & 1 deletion omv/engines/getbrian2.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

def install_brian2(version):
if not version:
version = "2.9.0"
version = "2.10.1"
try:
pip_install("brian2", version)
import brian2
Expand Down
2 changes: 2 additions & 0 deletions omv/engines/getmoose.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
def install_moose(version):
if not version:
version = "4.0.0.dev20240411"
version = "4.1.4" # temp test this, it is the latest on pypi...
try:
pip_install("pymoose", version)
pip_install("pint")
import moose

m = "Successfully installed MOOSE..."
Expand Down