Merge branch 'add-nest-3.5rc1' into 'master'

Add NEST versions 3.5rc1 (and a bugfix back-port 2.14.2)

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

packages/nest/package.py

@@ -26,6 +26,7 @@ class Nest(CMakePackage):
     git      = "https://github.com/nest/nest-simulator.git"
 
     version('master', branch='master')
+    version('3.5_rc1',sha256='0ccc520ff642be4a30c0606150a397e6137362a2acf76ea03a8ee2aa48803a3e')
     version('3.4',    sha256='c56699111f899045ba48e55e87d14eca8763b48ebbb3648beee701a36aa3af20')
     version('3.3',    sha256='179462b966cc61f5785d2fee770bc36f86745598ace9cd97dd620622b62043ed')
     version('3.2',    sha256='583d5725882ad5e8fd4fc7ffab425da97cbbb91fadbc327e940c184e8892b958')
@@ -38,6 +39,7 @@ class Nest(CMakePackage):
     version('2.20.0', sha256='40e33187c22d6e843d80095b221fa7fd5ebe4dbc0116765a91fc5c425dd0eca4', deprecated=True)
     version('2.18.0', sha256='7295c936fbdd5486395b06f54f0d4d35d9a1b6ee50b7b844186ec2c92de641d1', deprecated=True)
     version('2.16.0', sha256='abfeb61719dec54da9477be035bef1d9d764f4e7663f63f6a6d9211f967e0490', deprecated=True)
+    version('2.14.2', sha256='c80050ea94751a7f63bb255bdc518e03a033c4352903d2e06456157314cd42c3')
     version('2.14.1', sha256='23aeadd0b8eda83a31797751f96855b0208979d70472e0f6752a7ce7ea80ad7a')
     version('2.14.0', sha256='d6316d6c9153100a3220488abfa738958c4b65bf2622bd15540e4aa81e79f17f')
     version('2.12.0', sha256='bac578f38bb0621618ee9d5f2f1febfee60cddc000ff32e51a5f5470bb3df40d')
@@ -62,6 +64,8 @@ class Nest(CMakePackage):
             description="Build shared libraries")
     variant('testsuite', default=False,
             description="Run extended testsuite with full number of unit- and integration tests")
+    variant('sonata',    default=False,
+            description="Enable direct reading of connectivity from SONATA files")
     variant('boost',    default=True,
             description="Enable optimizations provided via Boost library algorithms and containers")
     # TODO add variants for neurosim and music when these are in spack
@@ -84,6 +88,9 @@ class Nest(CMakePackage):
     depends_on('py-setuptools',     when='+python', type='build')
     depends_on('boost',             when="@2.16:+boost", type='build')
     depends_on('py-setuptools@:44.99.99',     when='@:2.15.99+python', type='build')
+    depends_on('py-h5py',           when='@3.4.99:+sonata', type=('test', 'build', 'run'))
+    depends_on('hdf5+cxx',          when='@3.4.99:+sonata', type=('build', 'run'))
+    depends_on('py-pandas',         when='@3.4.99:+sonata', type=('build', 'run'))
 
     depends_on('py-nose',           when='@:2.99.99+python+testsuite', type='test')
     depends_on('py-pytest',         when='@3.0:+testsuite', type='test')
@@ -171,6 +178,11 @@ class Nest(CMakePackage):
                 args.append('-Dwith-python=OFF')
                 args.append('-Dcythonize-pynest=OFF')
 
+        if '+sonata' in self.spec:
+            args.append('-Dwith-hdf5=ON')
+        else:
+            args.append('-Dwith-hdf5=OFF')
+
         if '+shared' in self.spec:
             args.append('-Dstatic-libraries=OFF')
         else:

spack.yaml

@@ -22,7 +22,7 @@ spack:
     - biobb-structure-checking@3.12.1
     - biobb-structure-utils@4.0.0
     - hxtorch@5.0-rc1
-    - nest@3.4
+    - nest@3.5_rc1 +sonata
     - neuron@8.2.2 +mpi
     - nglview@3.0.4
     - py-brian2@2.5.0.2