Merge branch 'enable_oppulance_in_pynn-brainscales' into 'master'

Enable oPPUlance support in pynn-brainscales

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

packages/pynn-brainscales/package.py

@@ -15,14 +15,7 @@ class PynnBrainscales(WafPackage):
     version('2.0-rc1', branch='waf')
 
     # PPU compiler dependencies
-    depends_on('gettext')
-    depends_on('zlib')
-    depends_on('bison')
-    depends_on('flex')
-    depends_on('m4')
-    depends_on('texinfo')
-    depends_on('wget')
-    conflicts('flex', when='@2.6.3', msg='Binutils 2.25 for Nux doesn\'t build with flex 2.6.3.')
+    depends_on('oppulance@2.0-rc2')
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run'))
@@ -108,7 +101,7 @@ class PynnBrainscales(WafPackage):
     def configure(self, spec, prefix):
         """Setup and configure the project."""
 
-        self.waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects', '--without-grenade-ppu-support', '--without-munge',
+        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',

spack.yaml

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