diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e001e7..ffaec20 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [ "3.11" ] + python-version: [ "3.12" ] engine: - Arbor - "Brian2:2.9.0" @@ -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 }} @@ -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 diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index c6848ef..3778433 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -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 diff --git a/omv/engines/getbrian2.py b/omv/engines/getbrian2.py index dc42663..6b98ad2 100644 --- a/omv/engines/getbrian2.py +++ b/omv/engines/getbrian2.py @@ -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 diff --git a/omv/engines/getmoose.py b/omv/engines/getmoose.py index fbc2da4..3e258c2 100644 --- a/omv/engines/getmoose.py +++ b/omv/engines/getmoose.py @@ -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..."