Skip to content

Commit 772023b

Browse files
authored
Merge pull request #126 from OpenSourceBrain/test_pynn011
Update to use PyNN v0.11.0, NEST 3.5, NEURON 8.2.2 in tests
2 parents e2b060d + 19134e6 commit 772023b

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
run: |
6767
pip install .
6868
pip install scipy sympy matplotlib cython pandas tables
69-
pip install 'numpy<=1.23.0' # temp fix for https://levelup.gitconnected.com/fix-attributeerror-module-numpy-has-no-attribute-float-d7d68c5a4971
7069
#sudo apt install octave
7170
7271
- name: Run OMV tests on engine ${{ matrix.engine }}

omv/engines/getnest.py

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

99
def install_nest(version):
1010
if not version:
11-
version = "3.3"
11+
version = "3.5"
1212

1313
inform("Installing NEST", indent=2, verbosity=1)
1414
nestpath = os.path.join(os.environ["HOME"], "nest")

omv/engines/getnrn.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
def install_neuron(version):
1212
if not version:
1313
if sys.version_info.major == 3:
14-
version = "8.1" # 8.1 works with pynn 0.10.1
14+
version = "8.2.2" # for pynn 0.11.0
1515
else:
1616
version = "7.6"
1717

omv/engines/getpynn.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77

88
def install_pynn(version=None):
99
if not version:
10-
version = "0.10.1"
10+
version = "0.11.0"
1111

1212
try:
1313
# pip_install('lazyarray') # This should ideally be automatically installed with PyNN...
1414
# pip_install('neo>=0.11.0') # This should ideally be automatically installed with PyNN...
1515

16+
pip_install("pynn", version)
17+
import pyNN
18+
'''
1619
install_root = os.environ["HOME"]
1720
1821
pyNN_src = "PyNN_src"
@@ -33,6 +36,7 @@ def install_pynn(version=None):
3336
print(check_output(["pwd"]))
3437
print("Finished attempting to install PyNN")
3538
# import pyNN
39+
'''
3640
m = "Successfully installed pyNN..."
3741
except Exception as e:
3842
m = "ERROR during install_pynn: %s" % e

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = OSBModelValidation
3-
version = 0.2.22
3+
version = 0.3.1
44
author = Boris Marin, Padraig Gleeson
55
author_email = [email protected]
66
url = https://github.com/OpenSourceBrain/osb-model-validation
@@ -24,7 +24,7 @@ classifiers=
2424
[options]
2525
install_requires =
2626
PyYAML
27-
numpy
27+
numpy<2.0.0 # Due to other packages (e.g. tables) not working yet with numpy v2
2828
pyrx
2929
pathlib; python_version<'3.4'
3030
docopt

0 commit comments

Comments
 (0)