Merge branch 'master' into 'master'

Updates for tvb packages

See merge request akarmas/ebrains-spack-builds!19

packages/formencode/package.py → packages/py-formencode/package.py

@@ -6,7 +6,7 @@
 from spack import *
 
 
-class Formencode(PythonPackage):
+class PyFormencode(PythonPackage):
     """
     Requirement necessary for tvb-framework package.
     """

packages/pyaescrypt/package.py → packages/py-pyaescrypt/package.py

@@ -6,7 +6,7 @@
 from spack import *
 
 
-class Pyaescrypt(PythonPackage):
+class PyPyaescrypt(PythonPackage):
     """
     Requirement necessary for tvb-framework package.
     """

packages/tvb-framework/package.py

@@ -33,7 +33,7 @@ class TvbFramework(PythonPackage):
     # install_requires
     depends_on('py-alembic', type=('build', 'run'))
     depends_on('py-cherrypy', type=('build', 'run'))
-    # depends_on('py-formencode', type=('build', 'run'))
+    depends_on('py-formencode', type=('build', 'run'))
     # depends_on('py-gevent', type=('build', 'run'))
     depends_on('py-h5py', type=('build', 'run'))
     depends_on('py-jinja2', type=('build', 'run'))
@@ -42,6 +42,7 @@ class TvbFramework(PythonPackage):
     depends_on('py-pandas', type=('build', 'run'))
     depends_on('py-pillow', type=('build', 'run'))
     depends_on('py-psutil', type=('build', 'run'))
+    depends_on('py-pyaescrypt', type=('build', 'run'))
     depends_on('py-requests', type=('build', 'run'))
     depends_on('py-scikit-learn', type=('build', 'run'))
     depends_on('py-scipy', type=('build', 'run'))
@@ -52,4 +53,3 @@ class TvbFramework(PythonPackage):
     depends_on('tvb-library', type=('build', 'run'))
     depends_on('tvb-storage', type=('build', 'run'), when='@2.3')
     depends_on('py-werkzeug', type=('build', 'run'))
-

spack.yaml

@@ -20,6 +20,8 @@ spack:
     - tvb-data %gcc@10.3.0
     - tvb-library ^binutils+ld+gold %gcc@10.3.0
     - tvb-storage ^binutils+ld+gold %gcc@10.3.0
+    - py-pyaescrypt %gcc@10.3.0
+    - py-formencode %gcc@10.3.0
     - tvb-framework ^binutils+ld+gold %gcc@10.3.0
     - meta-brainscales %gcc@10.3.0
     - pynn-brainscales %gcc@10.3.0