Merge branch 'master' into 'experimental_rel'

create new experimental release

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

.gitlab-ci.yml

@@ -281,6 +281,7 @@ build-spack-env-on-runner:
   #     - "$SPACK_DEV_PATH"
   #     - "$SPACK_USER_CONFIG_PATH"
   #   when: always
+  timeout: 1 day
   artifacts:
     paths:
       - .spack-tmp/spack/spack-stage
@@ -298,6 +299,7 @@ sync-gitlab-spack-instance:
     SPACK_PATH: /mnt/spack
     SPACK_USER_CACHE_PATH: $SPACK_PATH/.spack
     SPACK_USER_CONFIG_PATH: $SPACK_PATH/.spack
+    SPACK_REPO_PATH: $SPACK_PATH/ebrains-spack-builds
   script:
     - rm -rf /mnt/build_logs/
     - |
@@ -314,6 +316,7 @@ sync-gitlab-spack-instance:
       EOF
       fi
     - . $SPACK_PATH/share/spack/setup-env.sh
+    - spack repo rm /builds/elmath/test
     # - spack bootstrap untrust github-actions
     - spack compiler find
     - spack compiler list
@@ -323,13 +326,17 @@ sync-gitlab-spack-instance:
     - spack compiler list
     - spack install python@3.8.11 %gcc@10.3.0 || (cp -r /tmp/spack/spack-stage /mnt/build_logs; exit 1)
     # - for section in $(spack config list); do spack config blame $section; done
-    - spack repo list | grep -q ebrains-spack-builds && echo "Repository registered already" || spack repo add $CI_PROJECT_DIR
+    - mkdir -p $SPACK_REPO_PATH && cp -r -t $SPACK_REPO_PATH $CI_PROJECT_DIR/{packages,repo.yaml}
+    - spack repo list | grep -q ebrains-spack-builds && echo "Repository registered already" || spack repo add $SPACK_REPO_PATH
     - spack repo list
     - spack env list | grep -q $SPACK_NFS_ENV && echo "Environment created already" || spack env create $SPACK_NFS_ENV $CI_PROJECT_DIR/spack.yaml
     - spack env activate $SPACK_NFS_ENV
     - cp $CI_PROJECT_DIR/spack.yaml $SPACK_ROOT/var/spack/environments/$SPACK_NFS_ENV/spack.yaml
     - spack concretize -f
     - spack install --no-check-signature || (cp -r /tmp/spack/spack-stage /mnt/build_logs; exit 1)
+    - spack module tcl refresh -y
+    - spack reindex
+    - spack env loads -r
   timeout: 2 days
   only:
     refs:

packages/py-pynn/package.py

@@ -15,6 +15,7 @@ class PyPynn(PythonPackage):
     pypi = "PyNN/PyNN-0.10.0.tar.gz"
     git = "https://github.com/NeuralEnsemble/PyNN.git"
 
+    version('0.10.1', sha256='03fbafeddd64ae7163e2b557b2760380b6eceb52469f1b3f4cc203bbb80f0cde')
     version('0.10.0', sha256='04120fe0e03260d664b337e0ac29d985c3fb3684ef35b1add93a66739891c98f')
     version('0.9.6', sha256='d85226800e30bc1692d3f84485c3fa20b921c2ab55f1201d0a3bf23432e16cd2')
     version('0.9.5', sha256='91af2126b639a6a795bfc2709ac49423278c4794b6d0da143908b9afcb415f80')
@@ -29,22 +30,21 @@ class PyPynn(PythonPackage):
 
     depends_on('py-numpy@1.8.2:',       type=('build', 'run'), when="@0.9.5")
     depends_on('py-numpy@1.13.0:',      type=('build', 'run'), when="@0.9.6")
-    depends_on('py-numpy@1.16.1:',      type=('build', 'run'), when="@0.10.0:")
+    depends_on('py-numpy@1.16.1:',      type=('build', 'run'), when="@0.10.0")
+    depends_on('py-numpy@1.18.5:',      type=('build', 'run'), when="@0.10.1:")
 
     depends_on('py-mpi4py', type=('build', 'run'), when='+mpi')
     depends_on('py-quantities@0.12.1:', type=('build', 'run'), when="@0.9.5:")
 
     depends_on('py-lazyarray@0.3.2:',   type=('build', 'run'), when="@0.9.5")
     depends_on('py-lazyarray@0.3.4:',   type=('build', 'run'), when="@0.9.6")
-    depends_on('py-lazyarray@0.5.0:',   type=('build', 'run'), when="@0.10.0:")
+    depends_on('py-lazyarray@0.5.0:',   type=('build', 'run'), when="@0.10.0")
+    depends_on('py-lazyarray@0.5.2:',   type=('build', 'run'), when="@0.10.1:")
 
     depends_on('py-neo@0.5.2:',         type=('build', 'run'), when="@0.9.5")
     depends_on('py-neo@0.8.0',          type=('build', 'run'), when="@0.9.6")
-    depends_on('py-neo@0.10.0:',        type=('build', 'run'), when="@0.10.0:")
-
-    depends_on('py-lazyarray@0.3.2:',   type=('build', 'run'), when="@0.9.5")
-    depends_on('py-lazyarray@0.3.4:',   type=('build', 'run'), when="@0.9.6")
-    depends_on('py-lazyarray@0.5.0:',   type=('build', 'run'), when="@0.10.0:")
+    depends_on('py-neo@0.10.0:',        type=('build', 'run'), when="@0.10.0")
+    depends_on('py-neo@0.11.0:',        type=('build', 'run'), when="@0.10.1:")
 
     depends_on('py-mock@1.0:', type='test')
 

spack.yaml

@@ -22,7 +22,7 @@ spack:
     - nest@3.3 +python +gsl +mpi
     - arbor +python +mpi ^python@3:3.9
     - neuron +mpi
-    - py-pynn@0.10.0 +mpi
+    - py-pynn@0.10.1 +mpi
     - py-brian2
     - tvb-data
     - tvb-library ^py-numba@0.54.0 ^binutils+ld+gold