Merge branch 'update_pynn-brainscales' into 'master'

Update pynn-brainscales to 2.0-rc5

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

packages/oppulance/package.py

@@ -21,8 +21,8 @@ class Oppulance(Package):
 
     releases = [
         {
-            'version': '2.0-rc2',
-            'tag': 'ebrains_release-2-rc2'
+            'version': '2.0-rc5',
+            'tag': 'ebrains-2.0-rc5'
         },
     ]
 

packages/pynn-brainscales/package.py

@@ -11,10 +11,10 @@ class PynnBrainscales(WafPackage):
     homepage = "https://github.com/electronicvisions/pynn-brainscales"
     git      = "https://github.com/electronicvisions/pynn-brainscales.git"
 
-    version('2.0-rc2', branch='waf')
+    version('2.0-rc5', branch='waf')
 
     # PPU compiler dependencies
-    depends_on('oppulance@2.0-rc2')
+    depends_on('oppulance@2.0:')
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run'))
@@ -101,16 +101,16 @@ 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-2.0-rc3',
-            '--project=haldls@ebrains-2.0-rc4',
+            '--project=pynn-brainscales@ebrains-' + str(spec.version),
+            '--project=haldls@ebrains-' + str(spec.version),
             '--project=grenade@ebrains-' + str(spec.version),
             '--project=code-format@ebrains-' + str(spec.version),
             '--project=logger@ebrains-' + str(spec.version),
-            '--project=halco@ebrains-2.0-rc4',
+            '--project=halco@ebrains-' + str(spec.version),
             '--project=hate@ebrains-' + str(spec.version),
-            '--project=fisch@ebrains-2.0-rc4',
+            '--project=fisch@ebrains-' + str(spec.version),
             '--project=ztl@ebrains-' + str(spec.version),
-            '--project=hxcomm@ebrains-2.0-rc3', # fix for ebrains build
+            '--project=hxcomm@ebrains-' + str(spec.version),
             '--project=rant@ebrains-' + str(spec.version),
             '--project=pywrap@ebrains-' + str(spec.version),
             '--project=lib-boost-patches@ebrains-' + str(spec.version),
@@ -120,7 +120,7 @@ class PynnBrainscales(WafPackage):
             '--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-rc4'
+            '--project=libnux@ebrains-' + str(spec.version)
          )
 
         args = ['--prefix={0}'.format(self.prefix)]

spack.yaml

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