Merge branch 'fix_and_update_brainscales_stuff' into 'master'

Fix and update brainscales stuff

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

packages/hxtorch/package.py

@@ -12,7 +12,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-rc5', branch='waf')
+    version('2.0-rc6', branch='waf')
 
     # PPU compiler dependencies
     depends_on('oppulance@2.0:')
@@ -43,7 +43,7 @@ class Hxtorch(WafPackage):
     depends_on('py-pycodestyle', type=('build', 'link', 'run'))
     depends_on('py-pyelftools', type=('build', 'link', 'run'))
     depends_on('py-pylint', type=('build', 'link', 'run'))
-    depends_on('py-pynn@0.9.4:', type=('build', 'link', 'run'))
+    depends_on('py-torch', type=('build', 'link', 'run'))
     depends_on('py-pyyaml', type=('build', 'link', 'run'))
     depends_on('py-scipy', type=('build', 'link', 'run'))
     depends_on('py-sqlalchemy', type=('build', 'link', 'run'))

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-rc5', branch='waf')
+    version('2.0-rc6', branch='waf')
 
     # PPU compiler dependencies
     depends_on('oppulance@2.0:')