diff --git a/packages/formencode/package.py b/packages/py-formencode/package.py similarity index 95% rename from packages/formencode/package.py rename to packages/py-formencode/package.py index 719ecad06e04b3eed6c525418d3841da61c6836d..7f78c770f65ef224378cadf77f1b9bddbcfdf8c0 100644 --- a/packages/formencode/package.py +++ b/packages/py-formencode/package.py @@ -6,7 +6,7 @@ from spack import * -class Formencode(PythonPackage): +class PyFormencode(PythonPackage): """ Requirement necessary for tvb-framework package. """ diff --git a/packages/pyaescrypt/package.py b/packages/py-pyaescrypt/package.py similarity index 95% rename from packages/pyaescrypt/package.py rename to packages/py-pyaescrypt/package.py index bc0d2487adbf771f9ce877a9e242acc493e11091..f8ec576a23bcc5165343a652c33e223c274f9b71 100644 --- a/packages/pyaescrypt/package.py +++ b/packages/py-pyaescrypt/package.py @@ -6,7 +6,7 @@ from spack import * -class Pyaescrypt(PythonPackage): +class PyPyaescrypt(PythonPackage): """ Requirement necessary for tvb-framework package. """ diff --git a/packages/tvb-framework/package.py b/packages/tvb-framework/package.py index 9d7d7197626ae69d93f941e4dec77e7b0e9644ec..f8958bc7ef1fe98a0bf46c71ad9e7c19aad54ac7 100644 --- a/packages/tvb-framework/package.py +++ b/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')) - diff --git a/spack.yaml b/spack.yaml index 95283f384b09ca23ff30447399a5b78915d8cac4..2d370cef42c6c6762b9c5147f479e473ba0402ce 100644 --- a/spack.yaml +++ b/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