Skip to content
Snippets Groups Projects
Commit 5446e138 authored by Eleni Mathioulaki's avatar Eleni Mathioulaki
Browse files

Merge branch 'test_new_py-pybind11' into 'revert-383726f9'

Test drive new py-pybind11

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!197
parents 052094f4 69ea2b50
No related branches found
No related tags found
3 merge requests!201create new experimental release,!197Test drive new py-pybind11,!196Revert "Revert "Merge branch 'brent-master-patch-66860' into 'master'""
Pipeline #19551 failed with stage
in 54 seconds
......@@ -13,10 +13,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-a1', branch='waf')
version('4.0-a2', branch='waf')
# PPU compiler dependencies
depends_on('oppulance@4.0:')
depends_on('oppulance@4.0-a2')
# host software dependencies
depends_on('bitsery', type=('build', 'link', 'run'))
......@@ -137,8 +137,6 @@ class Hxtorch(WafPackage):
"""Setup and configure the project."""
self.waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects', '--without-munge',
'--without-sctrltp-python-bindings',
'--without-hxcomm-python-bindings',
'--project=hxtorch@ebrains-' + str(spec.version),
'--project=haldls@ebrains-' + str(spec.version),
'--project=grenade@ebrains-' + str(spec.version),
......
......@@ -21,8 +21,8 @@ class Oppulance(Package):
releases = [
{
'version': '4.0-a1',
'tag': 'ebrains-4.0-a1'
'version': '4.0-a2',
'tag': 'ebrains-4.0-a2'
},
]
......
......@@ -11,10 +11,10 @@ class PynnBrainscales(WafPackage):
homepage = "https://github.com/electronicvisions/pynn-brainscales"
git = "https://github.com/electronicvisions/pynn-brainscales.git"
version('4.0-a1', branch='waf')
version('4.0-a2', branch='waf')
# PPU compiler dependencies
depends_on('oppulance@4.0:')
depends_on('oppulance@4.0-a2')
# host software dependencies
depends_on('bitsery', type=('build', 'link', 'run'))
......@@ -103,8 +103,6 @@ class PynnBrainscales(WafPackage):
"""Setup and configure the project."""
self.waf('setup', '--repo-db-url=https://github.com/electronicvisions/projects', '--without-munge',
'--without-sctrltp-python-bindings',
'--without-hxcomm-python-bindings',
'--project=pynn-brainscales@ebrains-' + str(spec.version),
'--project=haldls@ebrains-' + str(spec.version),
'--project=grenade@ebrains-' + str(spec.version),
......
......@@ -30,6 +30,7 @@ spack:
- py-pyaescrypt
- py-formencode
- tvb-framework ^binutils+ld+gold
- py-pybind11@2.10.1:
- pynn-brainscales@4.0-a1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
- hxtorch@4.0-a1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
- py-neo
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment