From 7ee4050dae4a3a035707ca25369e812ff8a1f49a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Mon, 4 Mar 2024 15:02:07 +0100
Subject: [PATCH] fix(BSS2): update packages
This pulls in a quickfix that avoids `import yaml` during `waf setup`,
i.e. `spack fetch` operation.
---
packages/hxtorch/package.py | 6 ++++--
packages/oppulance/package.py | 4 ++++
packages/pynn-brainscales/package.py | 6 ++++--
packages/wf-brainscales2-demos/package.py | 1 +
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/packages/hxtorch/package.py b/packages/hxtorch/package.py
index 85fdcbe1..63c3e5cc 100644
--- a/packages/hxtorch/package.py
+++ b/packages/hxtorch/package.py
@@ -19,11 +19,13 @@ class Hxtorch(WafPackage):
maintainers = ['emuller']
+ version('7.0-rc1-fixup3', tag='hxtorch-7.0-rc1-fixup3')
version('7.0-rc1-fixup2', tag='hxtorch-7.0-rc1-fixup2')
version('7.0-rc1-fixup1', branch='waf')
# compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
# building/linking, at runtime and for testing
+ depends_on('oppulance@7.0-rc1-fixup3', when='@7.0-rc1-fixup3', type=('build', 'link', 'run', 'test'))
depends_on('oppulance@7.0-rc1-fixup2', when='@7.0-rc1-fixup2', type=('build', 'link', 'run', 'test'))
depends_on('oppulance@7.0-rc1-fixup1', when='@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
@@ -78,8 +80,8 @@ class Hxtorch(WafPackage):
return
with working_dir(self.stage.source_path):
- waf = which('./waf')
- waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects',
+ python = which('python3')
+ python('./waf', 'setup', '--repo-db-url=https://github.com/electronicvisions/projects',
'--clone-depth=2',
'--without-munge',
'--without-hxcomm-hostarq',
diff --git a/packages/oppulance/package.py b/packages/oppulance/package.py
index a12fac91..c6e2021b 100644
--- a/packages/oppulance/package.py
+++ b/packages/oppulance/package.py
@@ -21,6 +21,10 @@ class Oppulance(Package):
depends_on('gmp')
releases = [
+ {
+ 'version': '7.0-rc1-fixup3',
+ 'tag': 'ebrains-7.0-rc1-fixup3'
+ },
{
'version': '7.0-rc1-fixup2',
'tag': 'ebrains-7.0-rc1-fixup2'
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index c715d46d..4b088549 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -19,11 +19,13 @@ class PynnBrainscales(WafPackage):
maintainers = ['emuller']
+ version('7.0-rc1-fixup3', tag='pynn-brainscales-7.0-rc1-fixup3')
version('7.0-rc1-fixup2', tag='pynn-brainscales-7.0-rc1-fixup2')
version('7.0-rc1-fixup1', branch='waf')
# compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
# building/linking, at runtime and for testing
+ depends_on('oppulance@7.0-rc1-fixup3', when='@7.0-rc1-fixup3', type=('build', 'link', 'run', 'test'))
depends_on('oppulance@7.0-rc1-fixup2', when='@7.0-rc1-fixup2', type=('build', 'link', 'run', 'test'))
depends_on('oppulance@7.0-rc1-fixup1', when='@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
@@ -75,8 +77,8 @@ class PynnBrainscales(WafPackage):
return
with working_dir(self.stage.source_path):
- waf = which('./waf')
- waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects',
+ python = which('python3')
+ python('./waf', 'setup', '--repo-db-url=https://github.com/electronicvisions/projects',
'--clone-depth=2',
'--without-munge',
'--without-hxcomm-hostarq',
diff --git a/packages/wf-brainscales2-demos/package.py b/packages/wf-brainscales2-demos/package.py
index f54ebef1..914fa180 100644
--- a/packages/wf-brainscales2-demos/package.py
+++ b/packages/wf-brainscales2-demos/package.py
@@ -17,6 +17,7 @@ class WfBrainscales2Demos(Package):
maintainer = ["muffgaga"]
# ECM: we probably should build the ipynb file in this package
+ version("7.0-rc1-fixup3", tag="jupyter-notebooks-7.0-rc1-fixup3")
version("23.6", branch="jupyter-notebooks-experimental")
depends_on('hxtorch', type=("run", "test"))
--
GitLab