From da7d5f9160cf0413d395da56ca9c4cb8cdf65818 Mon Sep 17 00:00:00 2001 From: liadomide <lia_domide@yahoo.com> Date: Fri, 21 Feb 2025 13:36:15 +0200 Subject: [PATCH 1/3] tvb-library version 2.9.2 --- packages/py-tvb-library/package.py | 5 ++--- spack.yaml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/py-tvb-library/package.py b/packages/py-tvb-library/package.py index 5506bc36..cba366b8 100644 --- a/packages/py-tvb-library/package.py +++ b/packages/py-tvb-library/package.py @@ -14,10 +14,11 @@ class PyTvbLibrary(PythonPackage): """ homepage = "https://www.thevirtualbrain.org/" - pypi = 'tvb-library/tvb_library-2.9.1.tar.gz' + pypi = 'tvb-library/tvb_library-2.9.2.tar.gz' maintainers = ['ldomide', 'paulapopa', 'teodoramisan'] + version('2.9.2', 'be3562b28464e51d09e9378d71996fc11522121124c5438dd3e9cdd71060d09e') version('2.9.1', 'a251f602bffe768e6184ffc14d3d6ad9f03be879a78062a7397c30a5f8878b41') version('2.9', '0a65fa3d803ef8da3d69a0f27a13e40b79876ee6d5b627c34d0c9fc5c12697e6') version('2.8.2', '4222dadbecce53b29e2141801b1ca8eb99c4595ace6c7d0469f7e0a41d3f384a') @@ -62,8 +63,6 @@ class PyTvbLibrary(PythonPackage): depends_on('py-pytest-benchmark', type='test') depends_on('py-pytest-xdist', type='test') - skip_modules = ['tvb.tests.library.simulator.rateml_test', "tvb/tests/library/simulator/rateml_test"] - @run_after('install') @on_package_attributes(run_tests=True) def install_test(self): diff --git a/spack.yaml b/spack.yaml index 5f8217b5..79fd41e2 100644 --- a/spack.yaml +++ b/spack.yaml @@ -49,7 +49,7 @@ spack: - py-spynnaker@7.3.0 - py-tvb-framework@2.9 - py-tvb-contrib@2.9.1 - - py-tvb-library@2.9.1 + - py-tvb-library@2.9.2 - py-tvb-multiscale@2.1.0.ebrains - py-tvb-widgets@2.1.0 - py-tvb-ext-bucket -- GitLab From 4ca8bc205a073a771eb83c27e256585f9644b391 Mon Sep 17 00:00:00 2001 From: liadomide <lia_domide@yahoo.com> Date: Fri, 21 Feb 2025 13:54:56 +0200 Subject: [PATCH 2/3] we changed from setup.py into pyproject.toml --- packages/py-tvb-library/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/py-tvb-library/package.py b/packages/py-tvb-library/package.py index cba366b8..db075a86 100644 --- a/packages/py-tvb-library/package.py +++ b/packages/py-tvb-library/package.py @@ -36,8 +36,8 @@ class PyTvbLibrary(PythonPackage): # python_requires depends_on('python@3.8:', type=('build', 'run')) - # setup_requires - depends_on('py-setuptools', type='build') + # build_requires + depends_on('py-hatchling', type='build') # install_requires depends_on('py-autopep8', type=('build', 'run')) -- GitLab From f58037496df4599de648ee682778f50426461d4f Mon Sep 17 00:00:00 2001 From: Eleni Mathioulaki <emathioulaki@athenarc.gr> Date: Fri, 21 Feb 2025 15:18:06 +0100 Subject: [PATCH 3/3] add scipy dependency version range --- packages/py-tvb-library/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/py-tvb-library/package.py b/packages/py-tvb-library/package.py index db075a86..c624a102 100644 --- a/packages/py-tvb-library/package.py +++ b/packages/py-tvb-library/package.py @@ -54,6 +54,7 @@ class PyTvbLibrary(PythonPackage): depends_on('py-numba', type=('build', 'run')) depends_on('py-numexpr', type=('build', 'run')) depends_on('py-scipy', type=('build', 'run')) + depends_on('py-scipy@:1.13', type=('build', 'run'), when='@:2.9.1') depends_on('py-six', type=('build', 'run')) depends_on('py-tvb-data', type=('run', 'test')) depends_on('py-tvb-gdist', type=('run', 'test')) -- GitLab