Skip to content

Commit dc54ddc

Browse files
authored
Merge pull request #137 from OpenSourceBrain/development
To v0.3.7; unpin numpy; limit cython<3.1.0 for nest build
2 parents 9410aa5 + 592658f commit dc54ddc

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
python-version: [ "3.10" ]
1919
engine:
2020
- Arbor
21-
- "Brian2:2.4"
21+
- "Brian2:2.9.0"
2222
- Brian2
2323
- EDEN
2424
- "NEST:3.3"
@@ -63,7 +63,7 @@ jobs:
6363
- name: Install OMV
6464
run: |
6565
pip install .
66-
pip install scipy sympy matplotlib cython pandas tables
66+
pip install scipy sympy matplotlib "cython<3.1.0" pandas tables
6767
#sudo apt install octave
6868
sudo apt-get install -y subversion # for neuroConstruct full install...
6969

.github/workflows/ci_versions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: [ubuntu-latest, macos-latest, ubuntu-24.04 ]
1818
exclude:
1919
- runs-on: macos-latest
20-
python-version: "3.9"
20+
python-version: ["3.9"]
2121

2222
steps:
2323
- uses: actions/checkout@v4
@@ -50,4 +50,4 @@ jobs:
5050
run: |
5151
omv list -V # list installed engines
5252
env
53-
pip list
53+
pip list

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,4 @@ Since you can run the validation with different [engines](https://github.com/Ope
157157
### Running tests automatically on GitHub Actions
158158

159159
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.
160+

omv/engines/getbrian2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
def install_brian2(version):
77
if not version:
8-
version = "2.5.3"
8+
version = "2.7.1"
99
try:
1010
pip_install("brian2", version)
1111
import brian2

setup.cfg

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = OSBModelValidation
3-
version = 0.3.6
3+
version = 0.3.7
44
author = Boris Marin, Padraig Gleeson
55
author_email = [email protected]
66
url = https://github.com/OpenSourceBrain/osb-model-validation
@@ -13,18 +13,17 @@ classifiers=
1313
License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
1414
Natural Language :: English
1515
Operating System :: OS Independent
16-
Programming Language :: Python :: 3.7
17-
Programming Language :: Python :: 3.8
1816
Programming Language :: Python :: 3.9
1917
Programming Language :: Python :: 3.10
2018
Programming Language :: Python :: 3.11
2119
Programming Language :: Python :: 3.12
20+
Programming Language :: Python :: 3.13
2221
Topic :: Scientific/Engineering
2322

2423
[options]
2524
install_requires =
2625
PyYAML
27-
numpy<2.0.0 # Due to other packages (e.g. tables) not working yet with numpy v2
26+
numpy
2827
pyrx
2928
pathlib; python_version<'3.4'
3029
docopt

0 commit comments

Comments
 (0)