circuit-building: updates all around. (BlueBrain#801)

lguyot · May 4, 2020 · 0fe83a0 · 0fe83a0
1 parent caab8d6
commit 0fe83a0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/deploy/packages/bbp-packages.yaml b/deploy/packages/bbp-packages.yaml
@@ -27,7 +27,7 @@ packages:
       - brion@3.1.0 +python
       - connectome-tools@0.3.2
       - spatial-index@0.2.1
-      - spykfunc@0.15.3
+      - spykfunc@0.15.4
       - psp-validation@0.2.1
       - py-pytouchreader@1.4.5
       - py-basalt@0.2.9
@@ -61,9 +61,9 @@ packages:
       - mpi
     specs:
       - functionalizer@3.12.2
-      - parquet-converters@0.5.4
+      - parquet-converters@0.5.5
       - synapsetool@0.5.8
-      - touchdetector@5.3.3
+      - touchdetector@5.4.0
       - brayns +opendeck +brion ^ospray@1.7.3%intel@19.0.4
       - brayns@1.0.1 +brion ^ospray%intel@19.0.4
       - brayns@immersive +opendeck +brion +optix

diff --git a/var/spack/repos/builtin/packages/parquet-converters/package.py b/var/spack/repos/builtin/packages/parquet-converters/package.py
@@ -14,6 +14,7 @@ class ParquetConverters(CMakePackage):
     git      = "ssh://bbpcode.epfl.ch/building/ParquetConverters"
 
     version('develop', submodules=True)
+    version('0.5.5', tag='v0.5.5', submodules=True)
     version('0.5.4', tag='v0.5.4', submodules=True)
     version('0.5.3', tag='v0.5.3', submodules=True)
     version('0.5.2', tag='v0.5.2', submodules=True)

diff --git a/var/spack/repos/builtin/packages/spykfunc/package.py b/var/spack/repos/builtin/packages/spykfunc/package.py
@@ -23,10 +23,11 @@ class Spykfunc(PythonPackage):
     version('0.15.1', tag='v0.15.1', submodules=True, get_full_repo=True)
     version('0.15.2', tag='v0.15.2', submodules=True, get_full_repo=True)
     version('0.15.3', tag='v0.15.3', submodules=True, get_full_repo=True)
+    version('0.15.4', tag='v0.15.4', submodules=True, get_full_repo=True)
 
-    depends_on('cmake', type='build', when='@0.16:')
-    depends_on('boost', type=('build', 'link'), when='@0.16:')
-    depends_on('morpho-kit', type=('build', 'link'), when='@0.16:')
+    depends_on('cmake', type='build', when='@0.15.4:')
+    depends_on('boost', type=('build', 'link'), when='@0.15.4:')
+    depends_on('morpho-kit', type=('build', 'link'), when='@0.15.4:')
 
     # Note : when spark is used as external package, spec['java'] is not
     # accessible. Add explicit dependency for now.
@@ -35,7 +36,7 @@ class Spykfunc(PythonPackage):
     depends_on('py-mvdtool~mpi', type=('build', 'run'), when='@0.14.4:')
 
     depends_on('python@3.6:')
-    depends_on('py-cython', type='run', when='@:0.15.99')
+    depends_on('py-cython', type='run', when='@:0.15.3')
     depends_on('py-setuptools', type=('build', 'run'))
 
     depends_on('spark+hadoop@2.3.2rc2:', type='run')
@@ -49,6 +50,7 @@ class Spykfunc(PythonPackage):
     depends_on('py-hdfs', type=('build', 'run'))
     depends_on('py-jprops', type=('build', 'run'))
     depends_on('py-lazy-property', type=('build', 'run'))
+    depends_on('py-libsonata', type='run', when='@0.15.3:')
     depends_on('py-lxml', type=('build', 'run'))
     depends_on('py-morpho-kit', type=('build', 'run'), when='@0.14.4:')
     depends_on('py-numpy', type=('build', 'run'))

diff --git a/var/spack/repos/builtin/packages/touchdetector/package.py b/var/spack/repos/builtin/packages/touchdetector/package.py
@@ -14,6 +14,7 @@ class Touchdetector(CMakePackage):
     git      = "ssh://bbpcode.epfl.ch/building/TouchDetector"
 
     version('develop', submodules=True)
+    version('5.4.0', tag='5.4.0', submodules=True)
     version('5.3.4', tag='5.3.4', submodules=True)
     version('5.3.3', tag='5.3.3', submodules=True)
     version('5.3.2', tag='5.3.2', submodules=True)