Merge branch 'fix_pynn-brainscales_2' into 'master'

Fix pynn-brainscales build #2

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

packages/pynn-brainscales/package.py

@@ -9,10 +9,9 @@ class PynnBrainscales(WafPackage):
     """PyNN toplevel for the BrainScaleS-2 neuromorphic hardware systems"""
 
     homepage = "https://github.com/electronicvisions/pynn-brainscales"
-    #url      = "https://github.com/electronicvisions/pynn-brainscales/archive/v0.1.0.tar.gz"
     git      = "https://github.com/electronicvisions/pynn-brainscales.git"
 
-    version('2.0-rc1', branch='waf')
+    version('2.0-rc2', branch='waf')
 
     # PPU compiler dependencies
     depends_on('oppulance@2.0-rc2')
@@ -102,28 +101,35 @@ class PynnBrainscales(WafPackage):
         """Setup and configure the project."""
 
         self.waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects', '--without-munge',
-            '--project=pynn-brainscales@ebrains_release-2-rc1',
-            '--project=haldls@ebrains_release-2-rc1',
-            '--project=grenade@ebrains_release-2-rc1',
-            '--project=code-format@ebrains_release-2-rc1',
-            '--project=logger@ebrains_release-2-rc1',
-            '--project=halco@ebrains_release-2-rc1',
-            '--project=hate@ebrains_release-2-rc1',
-            '--project=fisch@ebrains_release-2-rc1',
-            '--project=ztl@ebrains_release-2-rc1',
-            '--project=hxcomm@ebrains_release-2-rc1',
-            '--project=rant@ebrains_release-2-rc1',
-            '--project=pywrap@ebrains_release-2-rc1',
-            '--project=lib-boost-patches@ebrains_release-2-rc1',
-            '--project=sctrltp@ebrains_release-2-rc1',
-            '--project=hwdb@ebrains_release-2-rc1',
-            '--project=visions-slurm@ebrains_release-2-rc1',
-            '--project=flange@ebrains_release-2-rc1',
-            '--project=lib-rcf@ebrains_release-2-rc1',
-            '--project=bss-hw-params@ebrains_release-2-rc1'
+            '--project=pynn-brainscales@ebrains-' + str(spec.version),
+            '--project=haldls@ebrains-2.0-rc3',
+            '--project=grenade@ebrains-' + str(spec.version),
+            '--project=code-format@ebrains-' + str(spec.version),
+            '--project=logger@ebrains-' + str(spec.version),
+            '--project=halco@ebrains-2.0-rc3',
+            '--project=hate@ebrains-' + str(spec.version),
+            '--project=fisch@ebrains-2.0-rc3',
+            '--project=ztl@ebrains-' + str(spec.version),
+            '--project=hxcomm@ebrains-2.0-rc3', # fix for ebrains build
+            '--project=rant@ebrains-' + str(spec.version),
+            '--project=pywrap@ebrains-' + str(spec.version),
+            '--project=lib-boost-patches@ebrains-' + str(spec.version),
+            '--project=sctrltp@ebrains-' + str(spec.version),
+            '--project=hwdb@ebrains-' + str(spec.version),
+            '--project=visions-slurm@ebrains-' + str(spec.version),
+            '--project=flange@ebrains-' + str(spec.version),
+            '--project=lib-rcf@ebrains-' + str(spec.version),
+            '--project=bss-hw-params@ebrains-' + str(spec.version),
+            '--project=libnux@ebrains-2.0-rc3'
          )
 
         args = ['--prefix={0}'.format(self.prefix)]
         args += self.configure_args()
 
         self.waf('configure', *args)
+
+    def build_args(self):
+        # keep going after fails
+        args = ['--keep']
+
+        return args

spack.yaml

@@ -28,7 +28,7 @@ spack:
     - py-pyaescrypt
     - py-formencode
     - tvb-framework ^binutils+ld+gold
-    - pynn-brainscales@2.0-rc1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
+    - pynn-brainscales@2.0-rc2 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
     - py-neo
     #- py-cerebstats
     #- py-cerebunit