From e660e73a8f65e0f419451465cc27ecaa64d0e265 Mon Sep 17 00:00:00 2001
From: popaula937 <paula.popa@codemart.ro>
Date: Thu, 30 Sep 2021 10:07:39 +0300
Subject: [PATCH] Add specs in spack.yaml. Update names for pyaescrypt and
formencode and specify them as dependencies for tvb-framework.
---
packages/{formencode => py-formencode}/package.py | 2 +-
packages/{pyaescrypt => py-pyaescrypt}/package.py | 2 +-
packages/tvb-framework/package.py | 4 ++--
spack.yaml | 2 ++
4 files changed, 6 insertions(+), 4 deletions(-)
rename packages/{formencode => py-formencode}/package.py (95%)
rename packages/{pyaescrypt => py-pyaescrypt}/package.py (95%)
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 719ecad0..7f78c770 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 bc0d2487..f8ec576a 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 9d7d7197..f8958bc7 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 95283f38..2d370cef 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
--
GitLab