Merge branch 'fix_bss2_python_install_path' into 'master'

feat(bss2): update software (fix python install paths)

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

packages/hxtorch/package.py

@@ -16,11 +16,11 @@ class Hxtorch(WafPackage):
 
     maintainers = ['emuller']
 
-    version('7.0-rc1', branch='waf')
+    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', type=('build', 'link', 'run', 'test'))
+    depends_on('oppulance@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run', 'test'))
@@ -132,10 +132,6 @@ class Hxtorch(WafPackage):
         env.prepend_path('PATH', ':'.join(path))
 
     def _setup_common_env(self, env):
-        # TODO: use standard install layout for Python modules and extensions'
-        # shared objects => remove then
-        env.prepend_path('PYTHONPATH', self.prefix.lib)
-
         # grenade needs to find some libraries for the JIT-compilation of
         # programs for BrainScaleS-2's embedded processor.
         ppu_include_dirs = []

packages/oppulance/package.py

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

packages/pynn-brainscales/package.py

@@ -16,11 +16,11 @@ class PynnBrainscales(WafPackage):
 
     maintainers = ['emuller']
     
-    version('7.0-rc1', branch='waf')
+    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', type=('build', 'link', 'run', 'test'))
+    depends_on('oppulance@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run', 'test'))
@@ -109,10 +109,6 @@ class PynnBrainscales(WafPackage):
         env.prepend_path('PATH', ':'.join(path))
 
     def _setup_common_env(self, env):
-        # TODO: use standard install layout for Python modules and extensions'
-        # shared objects => remove then
-        env.prepend_path('PYTHONPATH', self.prefix.lib)
-
         # grenade needs to find some libraries for the JIT-compilation of
         # programs for BrainScaleS-2's embedded processor.
         ppu_include_dirs = []

spack.yaml

@@ -12,7 +12,7 @@ spack:
     - biobb-model@4.0.0
     - biobb-structure-checking@3.12.1
     - biobb-structure-utils@4.0.0
-    - hxtorch@7.0-rc1
+    - hxtorch@7.0-rc1-fixup1
     - nest@3.6 +sonata
     - neuron@8.2.3 +mpi
     - py-bluepyefe@2.2.18
@@ -52,7 +52,7 @@ spack:
     - py-tvb-multiscale@2.1.0.ebrains
     - py-tvb-storage@2.8.1
     - py-viziphant@0.3.0
-    - pynn-brainscales@7.0-rc1
+    - pynn-brainscales@7.0-rc1-fixup1
     - r-rgsl@0.1.1
     - r-sbtabvfgen@0.1
     - r-uqsa@2.2