Merge branch 'master' into 'master'

Update tvb-multiscale 2.1.0 and tvb-contrib 2.8.2 after merging from ebrains technical coordination

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!416

packages/py-tvb-contrib/package.py

@@ -12,10 +12,11 @@ class PyTvbContrib(PythonPackage):
     """
 
     homepage = "https://www.thevirtualbrain.org/"
-    pypi = 'tvb-contrib/tvb-contrib-2.8.1.tar.gz'
+    pypi = 'tvb-contrib/tvb-contrib-2.8.2.tar.gz'
 
     maintainers = ['dionperd', 'paulapopa', "ldomide"]
 
+    version('2.8.2', 'ff5990e979cf1f87046d7bed2c265f9dec50f9d817abaabdf5df7ec4482b5063')
     version('2.8.1', '0b9bc5f837913f1cba007d25ae94c9df51bf43bf19c9fb2af14a90cb6a1e1a66')
 
     # python_requires

packages/py-tvb-multiscale/package.py

@@ -12,13 +12,11 @@ class PyTvbMultiscale(PythonPackage):
     """
 
     homepage = "https://github.com/the-virtual-brain/tvb-multiscale"
-    # url = "https://github.com/the-virtual-brain/tvb-multiscale/archive/refs/tags/2.0.2.tar.gz"
-    url = "https://github.com/the-virtual-brain/tvb-multiscale/archive/refs/tags/2.0.3.dev.tar.gz"
+    url = "https://github.com/the-virtual-brain/tvb-multiscale/archive/refs/tags/2.1.0.ebrains.tar.gz"
 
-    maintainers = ['dionperd', 'paulapopa', "ldomide"]
+    maintainers = ['dionperd', 'paulapopa', "ldomide", "vbragin"]
 
-    # version('2.0.2', sha256='647079e649225c7e9029bea9485872836a6dfe027a29718413e1e9e00255f4e6')
-    version('2.0.3.dev', sha256='3763c709ccb554a4bb1a38350a8137e2287e4859ef5cd13ca744db3351ab0def')
+    version('2.1.0.ebrains', sha256='eab51e235f565cffbf300daa4b7c65a7afacde149e2eda0f49437db3c2429253')
 
     # python_requires
     depends_on('python@3.8:3.10', type=('build', 'run'))
@@ -36,6 +34,7 @@ class PyTvbMultiscale(PythonPackage):
     depends_on('py-nestml', type=('build', 'run'))
     depends_on('py-elephant', type=('build', 'run'))
     depends_on('py-pyspike', type=('build', 'run'))
+    # TODO: depends_on('py-ray', type=('build', 'run'))
 
     # Test dependency
     depends_on('py-pytest@:7.1', type='test')

spack.yaml

@@ -45,12 +45,12 @@ spack:
     - py-siibra@0.4a57
     - py-snudda@1.4.71
     - py-spynnaker@7.0.0
-    - py-tvb-contrib@2.8.1
+    - py-tvb-contrib@2.8.2
     - py-tvb-data@2.8
     - py-tvb-framework@2.8.2
     - py-tvb-gdist@2.2
     - py-tvb-library@2.8.2
-    - py-tvb-multiscale@2.0.3.dev
+    - py-tvb-multiscale@2.1.0.ebrains
     - py-tvb-storage@2.8.1
     - py-viziphant@0.3.0
     - pynn-brainscales@7.0-a1