EBR-75 Limit numpy before 2.0 and update to latest scipy EBR-81

the-virtual-brain · Jul 17, 2024 · 616099f · 616099f
1 parent 0b759bf
commit 616099f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tvb_framework/setup.py b/tvb_framework/setup.py
@@ -41,7 +41,7 @@
 TVB_TEAM = "Mihai Andrei, Lia Domide, Stuart Knock, Bogdan Neacsa, Paula Prodan, Paula Sansz Leon, Marmaduke Woodman"
 
 TVB_INSTALL_REQUIREMENTS = ["alembic", "bctpy", "cherrypy", "docutils", "flask", "flask-restx",
-                            "formencode", "gevent", "h5py", "Jinja2", "matplotlib", "nibabel", "numpy", "pandas",
+                            "formencode", "gevent", "h5py", "Jinja2", "matplotlib", "nibabel", "numpy<2.0", "pandas",
                             "Pillow", "psutil", "python-keycloak", "requests", "requests-toolbelt>=0.10",
                             "scikit-learn", "scipy", "siibra", "simplejson", "six", "sqlalchemy",
                             "tvb-data", "tvb-gdist", "tvb-library", "tvb-storage", "werkzeug"]

diff --git a/tvb_library/setup.py b/tvb_library/setup.py
@@ -40,7 +40,7 @@
 LIBRARY_TEAM = "Marmaduke Woodman,  Jan Fousek, Stuart Knock, Paula Sanz Leon, Viktor Jirsa"
 
 LIBRARY_REQUIRED_PACKAGES = ["autopep8", "Deprecated", "docutils", "ipywidgets", "mako>=1.1.4", "matplotlib",
-                             "networkx", "numba", "numexpr", "numpy", "scipy", "six"]
+                             "networkx", "numba", "numexpr", "numpy<2.0", "scipy", "six"]
 
 LIBRARY_REQUIRED_EXTRA = ["h5py", "pytest", "pytest-benchmark", "pytest-xdist", "tvb-gdist", "tvb-data"]
 

diff --git a/tvb_library/tvb/simulator/models/stefanescu_jirsa.py b/tvb_library/tvb/simulator/models/stefanescu_jirsa.py
@@ -29,7 +29,7 @@
 
 """
 import numpy
-from scipy.integrate import trapz as scipy_integrate_trapz
+from scipy.integrate import trapezoid as scipy_integrate_trapz
 from scipy.stats import norm as scipy_stats_norm
 from .base import Model
 from tvb.basic.neotraits.api import NArray, Final, List, Range