diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c246661..7fb36cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: python-version: [ "3.10" ] engine: - Arbor - - "Brian2:2.4" + - "Brian2:2.9.0" - Brian2 - EDEN - "NEST:3.3" @@ -63,7 +63,7 @@ jobs: - name: Install OMV run: | pip install . - pip install scipy sympy matplotlib cython pandas tables + pip install scipy sympy matplotlib "cython<3.1.0" pandas tables #sudo apt install octave sudo apt-get install -y subversion # for neuroConstruct full install... diff --git a/.github/workflows/ci_versions.yml b/.github/workflows/ci_versions.yml index 42de60b..21c8a6e 100644 --- a/.github/workflows/ci_versions.yml +++ b/.github/workflows/ci_versions.yml @@ -17,7 +17,7 @@ jobs: runs-on: [ubuntu-latest, macos-latest, ubuntu-24.04 ] exclude: - runs-on: macos-latest - python-version: "3.9" + python-version: ["3.9"] steps: - uses: actions/checkout@v4 @@ -50,4 +50,4 @@ jobs: run: | omv list -V # list installed engines env - pip list \ No newline at end of file + pip list diff --git a/README.md b/README.md index f7c0542..eb6aa24 100644 --- a/README.md +++ b/README.md @@ -157,3 +157,4 @@ Since you can run the validation with different [engines](https://github.com/Ope ### Running tests automatically on GitHub Actions To use OMV with GHA, copy an existing configuration file, e.g. https://github.com/OpenSourceBrain/ACnet2/blob/master/.github/workflows/omv-ci.yml and place it in the required repository. + diff --git a/omv/engines/getbrian2.py b/omv/engines/getbrian2.py index 68f7c6a..e5c4de8 100644 --- a/omv/engines/getbrian2.py +++ b/omv/engines/getbrian2.py @@ -5,7 +5,7 @@ def install_brian2(version): if not version: - version = "2.5.3" + version = "2.7.1" try: pip_install("brian2", version) import brian2 diff --git a/setup.cfg b/setup.cfg index a8e8a40..979a02a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = OSBModelValidation -version = 0.3.6 +version = 0.3.7 author = Boris Marin, Padraig Gleeson author_email = borismarin@gmail.com url = https://github.com/OpenSourceBrain/osb-model-validation @@ -13,18 +13,17 @@ classifiers= License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3) Natural Language :: English Operating System :: OS Independent - Programming Language :: Python :: 3.7 - Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 + Programming Language :: Python :: 3.13 Topic :: Scientific/Engineering [options] install_requires = PyYAML - numpy<2.0.0 # Due to other packages (e.g. tables) not working yet with numpy v2 + numpy pyrx pathlib; python_version<'3.4' docopt