Merge branch 'revert-674e26c0' into 'master'

Re-try "Update BrainScaleS-2 to latest HEAD"

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

packages/hxtorch/package.py

@@ -13,7 +13,7 @@ class Hxtorch(WafPackage):
     # This repo provides a waf binary used for the build below
     git      = "https://github.com/electronicvisions/pynn-brainscales.git"
 
-    version('2.0-rc8', branch='waf')
+    version('3.0-a1', branch='waf')
 
     # PPU compiler dependencies
     depends_on('oppulance@2.0:')

packages/oppulance/package.py

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

packages/pynn-brainscales/package.py

@@ -11,7 +11,7 @@ class PynnBrainscales(WafPackage):
     homepage = "https://github.com/electronicvisions/pynn-brainscales"
     git      = "https://github.com/electronicvisions/pynn-brainscales.git"
 
-    version('2.0-rc8', branch='waf')
+    version('3.0-a1', branch='waf')
 
     # PPU compiler dependencies
     depends_on('oppulance@2.0:')

spack.yaml

@@ -29,8 +29,8 @@ spack:
     - py-pyaescrypt
     - py-formencode
     - tvb-framework ^binutils+ld+gold
-    - pynn-brainscales@2.0-rc8 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
-    - hxtorch@2.0-rc8 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
+    - pynn-brainscales@3.0-a1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
+    - hxtorch@3.0-a1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
     - py-neo
     #- py-cerebstats
     #- py-cerebunit