Merge branch 'master' into 'experimental_rel'

create new experimental release

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

.gitlab-ci.yml

@@ -254,12 +254,8 @@ build-spack-env-on-runner:
     - git checkout -b ebrains_spack_commit a8d440d3ababcdec20d665ad938ab880cd9b9d17
     - cd ../
     - mkdir $TMP
+    - cp packages.yaml $SPACK_DEV_PATH/etc/spack/packages.yaml
     - |
-      cat <<EOF > $SPACK_DEV_PATH/etc/spack/packages.yaml
-      packages:
-        all:
-          target: [x86_64]
-      EOF
       cat <<EOF > $SPACK_DEV_PATH/etc/spack/defaults/upstreams.yaml
       upstreams:
         ebrains-gitlab-spack-instance:
@@ -284,7 +280,7 @@ build-spack-env-on-runner:
   timeout: 1 day
   artifacts:
     paths:
-      - .spack-tmp/spack/spack-stage
+      - .spack-tmp/root/spack-stage
     when: on_failure
 
 
@@ -309,11 +305,7 @@ sync-gitlab-spack-instance:
         cd $SPACK_PATH
         git checkout -b ebrains_spack_commit a8d440d3ababcdec20d665ad938ab880cd9b9d17
         cd ../
-        cat <<EOF > $SPACK_PATH/etc/spack/packages.yaml
-      packages:
-        all:
-          target: [x86_64]
-      EOF
+        cp $CI_PROJECT_DIR/packages.yaml $SPACK_PATH/etc/spack/packages.yaml
       fi
     - . $SPACK_PATH/share/spack/setup-env.sh
     # - spack bootstrap untrust github-actions

packages.yaml

+packages:
+    all:
+        target: [x86_64]
+        compiler: [gcc@10.3.0]
+    python:
+        version: [3.8.11]

packages/hxtorch/package.py

@@ -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('3.0-a1', branch='waf')
+    version('4.0-a1', branch='waf')
 
     # PPU compiler dependencies
-    depends_on('oppulance@2.0:')
+    depends_on('oppulance@4.0:')
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run'))

packages/nest/package.py

@@ -185,3 +185,8 @@ class Nest(CMakePackage):
     # this should happen automatically for packages extending Python...
     def setup_run_environment(self, env):
         env.prepend_path('PYTHONPATH', self.prefix.lib64.join('python3.8/site-packages'))
+
+    def install_test(self):
+        # test inspired by py-numpy spack package
+        with working_dir('spack-test', create=True):
+            python('-c', 'from pprint import pprint; import nest; pprint(nest.get())')

packages/oppulance/package.py

@@ -21,8 +21,8 @@ class Oppulance(Package):
 
     releases = [
         {
-            'version': '3.0-a1',
-            'tag': 'ebrains-3.0-a1'
+            'version': '4.0-a1',
+            'tag': 'ebrains-4.0-a1'
         },
     ]
 

packages/py-elephant/package.py

@@ -17,6 +17,7 @@ class PyElephant(PythonPackage):
     # list of GitHub accounts to notify when the package is updated.
     maintainers = ['Moritz-Alexander-Kern']
 
+    version('0.11.2', sha256='f8759fff0bbb136ae4ffc8d1eacadeea8ba56610d705c3bf207de87ada3ba240')
     version('0.11.1', sha256='d604a202583440fdf9d95d42cef50a410bd74fcaaa1a925b139435f27ab012ef')
     version('0.11.0', sha256='7b547964dbd196361edc922db2c5a7c0c886ef1effcca6c6dc7adb06f966a3be')
     version('0.10.0', sha256='7e69a113475e4db01b3563328953c037d37f1597d9f2edf0d51fb65e9aebf096')

packages/py-snudda/package.py

@@ -7,7 +7,7 @@ class PySnudda(Package):
 
     maintainers = ['hjorth','akarmas']
     
-    version('1.2.9', 'f4ea2e70dc877e0c60d358229e9d3b74', expand=False)
+    version('1.3.1', '1460fb79ad7fc08097d5f729c4a72388', expand=False)
     
     depends_on('python@3.8:', type=('build','run'))
     depends_on('py-pip', type='build')

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('3.0-a1', branch='waf')
+    version('4.0-a1', branch='waf')
 
     # PPU compiler dependencies
-    depends_on('oppulance@2.0:')
+    depends_on('oppulance@4.0:')
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run'))

spack.yaml

@@ -30,8 +30,8 @@ spack:
     - py-pyaescrypt
     - py-formencode
     - tvb-framework ^binutils+ld+gold
-    - pynn-brainscales@3.0-a1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
-    - hxtorch@3.0-a1 ^log4cxx@0.10.0 ^googletest@1.11.0:+gmock
+    - 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
     - py-hdmf
     - py-pynwb
@@ -60,7 +60,7 @@ spack:
     - py-lfpy@2.2.6
     - py-elephant
     - py-frites
-    #- py-snudda
+    - py-snudda
     - biobb-common
     - biobb-gromacs
     - apbs
@@ -69,8 +69,3 @@ spack:
     # demo for codejam12
     #- funniest1022
   concretization: together
-  packages:
-    all:
-      compiler: [gcc@10.3.0]
-    python:
-      version: [3.8.11]