From c48da8308068d7064487c631e816bc0d24831f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20M=C3=BCller?= <mueller@kip.uni-heidelberg.de>
Date: Wed, 15 Jun 2022 18:13:32 +0200
Subject: [PATCH] Update pynn-brainscales to 2.0-rc5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* a few commits in pynn-brainscales (2), grenade (2), halco (2), hxcomm
(2), haldls (1), hwdb (1)
* add interface-draft for plasticity rules
* support for requestion server-side information
(`get_bitfile_info` and `get_repo_state`)
* also cleans up the tag mess in the dependent repositories…
really same tag everywhere
* same for oppulance; as software state didn't change, we don't require
oppulance to match pynn-brainscales version (rc2 is sufficient)…
relaxing constraint, rc2
---
packages/oppulance/package.py | 4 ++--
packages/pynn-brainscales/package.py | 16 ++++++++--------
spack.yaml | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/packages/oppulance/package.py b/packages/oppulance/package.py
index 8055b5c1..f212ef57 100644
--- a/packages/oppulance/package.py
+++ b/packages/oppulance/package.py
@@ -21,8 +21,8 @@ class Oppulance(Package):
releases = [
{
- 'version': '2.0-rc2',
- 'tag': 'ebrains_release-2-rc2'
+ 'version': '2.0-rc5',
+ 'tag': 'ebrains-2.0-rc5'
},
]
diff --git a/packages/pynn-brainscales/package.py b/packages/pynn-brainscales/package.py
index 72eed2f2..0cb2c050 100644
--- a/packages/pynn-brainscales/package.py
+++ b/packages/pynn-brainscales/package.py
@@ -11,10 +11,10 @@ class PynnBrainscales(WafPackage):
homepage = "https://github.com/electronicvisions/pynn-brainscales"
git = "https://github.com/electronicvisions/pynn-brainscales.git"
- version('2.0-rc2', branch='waf')
+ version('2.0-rc5', branch='waf')
# PPU compiler dependencies
- depends_on('oppulance@2.0-rc2')
+ depends_on('oppulance@2.0:')
# host software dependencies
depends_on('bitsery', type=('build', 'link', 'run'))
@@ -101,16 +101,16 @@ class PynnBrainscales(WafPackage):
"""Setup and configure the project."""
self.waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects', '--without-munge',
- '--project=pynn-brainscales@ebrains-2.0-rc3',
- '--project=haldls@ebrains-2.0-rc4',
+ '--project=pynn-brainscales@ebrains-' + str(spec.version),
+ '--project=haldls@ebrains-' + str(spec.version),
'--project=grenade@ebrains-' + str(spec.version),
'--project=code-format@ebrains-' + str(spec.version),
'--project=logger@ebrains-' + str(spec.version),
- '--project=halco@ebrains-2.0-rc4',
+ '--project=halco@ebrains-' + str(spec.version),
'--project=hate@ebrains-' + str(spec.version),
- '--project=fisch@ebrains-2.0-rc4',
+ '--project=fisch@ebrains-' + str(spec.version),
'--project=ztl@ebrains-' + str(spec.version),
- '--project=hxcomm@ebrains-2.0-rc3', # fix for ebrains build
+ '--project=hxcomm@ebrains-' + str(spec.version),
'--project=rant@ebrains-' + str(spec.version),
'--project=pywrap@ebrains-' + str(spec.version),
'--project=lib-boost-patches@ebrains-' + str(spec.version),
@@ -120,7 +120,7 @@ class PynnBrainscales(WafPackage):
'--project=flange@ebrains-' + str(spec.version),
'--project=lib-rcf@ebrains-' + str(spec.version),
'--project=bss-hw-params@ebrains-' + str(spec.version),
- '--project=libnux@ebrains-2.0-rc4'
+ '--project=libnux@ebrains-' + str(spec.version)
)
args = ['--prefix={0}'.format(self.prefix)]
diff --git a/spack.yaml b/spack.yaml
index 98cf61e0..60a65fdb 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -28,7 +28,7 @@ spack:
- py-pyaescrypt
- py-formencode
- tvb-framework ^binutils+ld+gold
- - pynn-brainscales@2.0-rc2 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
+ - pynn-brainscales@2.0-rc5 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
- py-neo
#- py-cerebstats
#- py-cerebunit
--
GitLab