Merge branch 'test-spacktests-workaround' into 'test-spacktests-workaround'

Update tvb-* packages to version 2.7.2. Fix tests

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

packages/py-tvb-data/package.py

@@ -11,18 +11,19 @@ class PyTvbData(PythonPackage):
     Various demonstration datasets for use with The Virtual Brain are provided here.
     """
 
-    homepage = "https://zenodo.org/record/4263723"
-    url = 'https://zenodo.org/record/4263723/files/tvb_data.zip'
+    homepage = "https://zenodo.org/record/7574266"
+    url = 'https://zenodo.org/record/7574266/files/tvb_data.zip'
 
     maintainers = ['paulapopa', "ldomide"]
 
+    version('2.7', 'f74ec53edadb4540da3de7268257dd20')
     version('2.0.3', '1e02cdc21147f46644c57b14429f564f')
 
     # python_requires
     depends_on('python@3.8:', type=('build', 'run'))
 
     # setup_requires
-    depends_on('py-setuptools', type='build')
+    depends_on('py-pip', type='build')
 
     # this is only a data holder package, thus no real python code exists inside.
     @run_after('install')
@@ -31,6 +32,9 @@ class PyTvbData(PythonPackage):
 
         with working_dir('spack-test', create=True):
             python('-c',
-                   'import tvb_data.connectivity; '
+                   'import tvb_data; '
                    'import os; '
-                   'assert os.path.exists(os.path.dirname(tvb_data.connectivity.__path__[0]))')
+                   'RR = tvb_data.__path__[0]; '
+                   'assert os.path.exists(os.path.join(RR, "Default_Project.zip")); '
+                   'assert os.path.exists(os.path.join(RR, "connectivity"))'
+                   '')

packages/py-tvb-framework/package.py

@@ -14,11 +14,11 @@ class PyTvbFramework(PythonPackage):
     """
 
     homepage = "https://www.thevirtualbrain.org/"
-    pypi = 'tvb-framework/tvb-framework-2.7.3.tar.gz'
+    pypi = 'tvb-framework/tvb-framework-2.7.3.1.tar.gz'
 
     maintainers = ['paulapopa', 'ldomide']
 
-    version('2.7.3', '9071aa4978747be59305caccfad636f61e0baed2deee59d08a87a24b0b77d8fb')
+    version('2.7.3.1', 'e1de0df0b8f43a317962b066790a5d724e1e6ae98ee124ad8b977f92aa228877')
     version('2.7.2', '1109c956c22e737d276bc822a69716c811d22e12f0606b47cc61700067af3ff4')
     version('2.7.1', '4645a489f24bc877370b213819bf4d31fbc4104bbfd0f3abde91a8d56635ee54')
     version('2.7', '6c16d95071283c3866660132f3f0ea789100d0e3b4c57daacbdb63506be7e29f')
@@ -55,7 +55,7 @@ class PyTvbFramework(PythonPackage):
     depends_on('py-simplejson', type=('build', 'run'))
     depends_on('py-six', type=('build', 'run'))
     depends_on('py-sqlalchemy', type=('build', 'run'))
-    depends_on('py-tvb-data', type='run')
+    depends_on('py-tvb-data', type=('run', 'test'))
     depends_on('py-tvb-gdist', type='run')
     depends_on('py-tvb-library', type=('build', 'run'))
     depends_on('py-tvb-storage', type=('build', 'run'))

packages/py-tvb-library/package.py

@@ -14,10 +14,11 @@ class PyTvbLibrary(PythonPackage):
     """
 
     homepage = "https://www.thevirtualbrain.org/"
-    pypi = 'tvb-library/tvb-library-2.7.2.tar.gz'
+    pypi = 'tvb-library/tvb-library-2.7.3.tar.gz'
 
     maintainers = ['paulapopa', 'ldomide']
 
+    version('2.7.3', 'bcf7ad291ff4549508f6720e207561f5f0bad638cd0d8507fd4ed9a7bcc561ff')
     version('2.7.2', 'cc93c15a3b2c59e9e808d099466b3cb38a07ef81f693f32f24d9a94c0cedd39f')
     version('2.7.1', '971f6a354231f7608484b17aa37ac053374b7beeab9c4676d3d28227f1fb100e')
     version('2.7', '0b28ee0221818f677ee26bd3cd590e42ccdfb6dea705bd78abf4788779f53f7d')
@@ -41,7 +42,7 @@ class PyTvbLibrary(PythonPackage):
     depends_on('py-lems', type=('build', 'run'))
     depends_on('py-mako', type=('build', 'run'))
     depends_on('py-matplotlib', type=('build', 'run'))
-    # networkx (only in one analyzer)
+    depends_on('py-networkx', type=('build', 'run'))
     depends_on('py-numpy', type=('build', 'run'))
     depends_on('py-numba', type=('build', 'run'))
     depends_on('py-numexpr', type=('build', 'run'))

packages/py-tvb-storage/package.py

@@ -14,10 +14,11 @@ class PyTvbStorage(PythonPackage):
     """
 
     homepage = "https://www.thevirtualbrain.org/"
-    pypi = 'tvb-storage/tvb-storage-2.7.2.tar.gz'
+    pypi = 'tvb-storage/tvb-storage-2.7.3.tar.gz'
 
     maintainers = ['paulapopa', 'ldomide']
 
+    version('2.7.3', '7f8b4d60313003e3c2b5b2f370f0a3a33ea5b22fde8b3f428eee7f2874673e4f')
     version('2.7.2', '501443ceb9f6374922a024b07ef09138f826fd0deaa69883c63dd0dff34fb16c')
     version('2.7', 'fd9e4d48517e91c0ad09de828668e27a9b19e5372d92fa3e3c8544b1cd8724a3')
     version('2.5', '749d1ef421a24a6f899ce8642c91660b4cccc72b1f00b1bbe08368e10f4f1159')

spack.yaml

@@ -27,9 +27,7 @@ spack:
     - py-tvb-data
     - py-tvb-gdist
     - py-tvb-library
-    - py-pyaescrypt
     - py-tvb-storage
-    - py-formencode
     - py-tvb-framework
     # - pynn-brainscales@4.0-a3 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
     # - hxtorch@4.0-a3 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock