Merge branch 'master' into 'experimental_rel'

create new experimental release

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

packages/hxtorch/package.py

@@ -14,10 +14,10 @@ class Hxtorch(WafPackage):
     # This repo provides a waf binary used for the build below
     git      = "https://github.com/electronicvisions/pynn-brainscales.git"
 
-    version('4.0-rc1', branch='waf')
+    version('4.0-rc2', branch='waf')
 
     # PPU compiler dependencies
-    depends_on('oppulance@4.0-rc1')
+    depends_on('oppulance@4.0-rc2')
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run'))
@@ -40,6 +40,7 @@ class Hxtorch(WafPackage):
     depends_on('py-h5py', type=('build', 'link', 'run')) # PyNN tests need it
     depends_on('py-jax@0.3.25:', type=('build', 'link', 'run'))
     depends_on('py-matplotlib', type=('build', 'link', 'run'))
+    depends_on('py-networkx', type=('build', 'link', 'run'))
     depends_on('py-nose', type=('build', 'link', 'run'))
     depends_on('py-numpy', type=('build', 'link', 'run'))
     depends_on('py-pybind11', type=('build', 'link', 'run'))

packages/oppulance/package.py

@@ -22,8 +22,8 @@ class Oppulance(Package):
 
     releases = [
         {
-            'version': '4.0-rc1',
-            'tag': 'ebrains-4.0-rc1'
+            'version': '4.0-rc2',
+            'tag': 'ebrains-4.0-rc2'
         },
     ]
 

packages/pynn-brainscales/package.py

@@ -13,10 +13,10 @@ class PynnBrainscales(WafPackage):
     homepage = "https://github.com/electronicvisions/pynn-brainscales"
     git      = "https://github.com/electronicvisions/pynn-brainscales.git"
 
-    version('4.0-rc1', branch='waf')
+    version('4.0-rc2', branch='waf')
 
     # PPU compiler dependencies
-    depends_on('oppulance@4.0-rc1')
+    depends_on('oppulance@4.0-rc2')
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run'))

spack.yaml

@@ -19,8 +19,8 @@ spack:
     - py-tvb-library@2.7.3
     - py-tvb-storage@2.7.3
     - py-tvb-framework@2.7.3.1
-    - pynn-brainscales@4.0-rc1
-    - hxtorch@4.0-rc1
+    - pynn-brainscales@4.0-rc2
+    - hxtorch@4.0-rc2
     - py-nestml@5.2.0
     - py-neo@0.12.0
     - py-hdmf@3.4.6