Merge branch 'master' into 'test-spacktests-workaround'

update branch

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

install_spack_env.sh

@@ -24,14 +24,12 @@ fi
 cp $EBRAINS_REPO/packages.yaml $INSTALLATION_ROOT/spack/etc/spack/packages.yaml
 source $INSTALLATION_ROOT/spack/share/spack/setup-env.sh
 
-# install platform compiler and python (extract versions from packages.yaml)
+# install platform compiler (extract version from packages.yaml)
 EBRAINS_SPACK_COMPILER=$(grep 'compiler' $EBRAINS_REPO/packages.yaml | awk -F'[][]' '{ print $2 }')
-EBRAINS_SPACK_PYTHON=python@$(grep -A1 'python:$' $EBRAINS_REPO/packages.yaml | tail -n1 | awk -F'[][]' '{ print $2 }')
 spack compiler find
 spack install $EBRAINS_SPACK_COMPILER
 spack load $EBRAINS_SPACK_COMPILER
 spack compiler find
-spack install $EBRAINS_SPACK_PYTHON %$EBRAINS_SPACK_COMPILER
 
 # add repo if it does not exist
 if [[ ! $(spack repo list | grep $EBRAINS_REPO) ]]

packages/biobb-common/package.py

-# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
 # Spack Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+
 from spack import *
 
 class BiobbCommon(PythonPackage):
@@ -10,15 +11,12 @@ class BiobbCommon(PythonPackage):
 
     # Homepage and download url
     homepage = "https://github.com/bioexcel/biobb_common"
-    #url = "https://github.com/bioexcel/biobb_common/tarball/v3.7.0"
-    git = 'https://github.com/bioexcel/biobb_common.git'
+    url      = "https://github.com/bioexcel/biobb_common/archive/refs/tags/v3.8.1.tar.gz"
 
-    # FIXME: Add a list of GitHub accounts to
-    # notify when the package is updated.
-    # maintainers = ['github_user1', 'github_user2']
+    maintainers = ['dbeltran']
 
     # Versions
-    version('3.8.1', branch='master')
+    version('3.8.1', sha256='b6c939c1445ea2f8282e491e0414cc15f4934466ca24ecd77e24cef2e7df49e4')
 
     # Dependencies
     depends_on('py-setuptools')
@@ -26,3 +24,4 @@ class BiobbCommon(PythonPackage):
     depends_on('py-pyyaml', type=('build', 'run'))
     depends_on('py-requests', type=('build', 'run'))
     depends_on('py-biopython@1.78:1.80', type=('build', 'run'))
+

packages/biobb-gromacs/package.py

+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
 from spack import *
 
 class BiobbGromacs(PythonPackage):
@@ -6,12 +12,14 @@ class BiobbGromacs(PythonPackage):
 
     # Homepage and download url
     homepage = "https://github.com/bioexcel/biobb_gromacs"
-    git = 'https://github.com/bioexcel/biobb_gromacs.git'
+    url      = "https://github.com/bioexcel/biobb_gromacs/archive/refs/tags/v3.8.1.tar.gz"
+
+    maintainers = ['dbeltran']
 
     # Versions
-    version('3.8.0', branch='master')
+    version('3.8.1', sha256='6da49b691b14a8bcf7ffca08c898fe9affd258ca2f8c7be4981df840a6907efa')
 
     # Dependencies
-    depends_on('python@3.8:', type=('build', 'run'))
-    depends_on('biobb-common')
+    depends_on('python@3.8:',type=('build', 'run'))
+    depends_on('biobb-common@3.8.1', type=('build', 'run'), when='@3.8.1')
     depends_on('gromacs')

packages/hxtorch/package.py

@@ -174,6 +174,6 @@ class Hxtorch(WafPackage):
         args = ['--test-execnone']
         return args
 
-    def install_test(self):
-        with working_dir('spack-test', create=True):
-            python('-c', 'import hxtorch; print(hxtorch.__file__)')
+    # def install_test(self):
+    #     with working_dir('spack-test', create=True):
+    #         python('-c', 'import hxtorch; print(hxtorch.__file__)')

packages/pynn-brainscales/package.py

@@ -151,6 +151,6 @@ class PynnBrainscales(WafPackage):
         args = ['--test-execnone']
         return args
 
-    def install_test(self):
-        with working_dir('spack-test', create=True):
-            python('-c', 'import pynn_brainscales; print(pynn_brainscales.__file__)')
+    # def install_test(self):
+    #     with working_dir('spack-test', create=True):
+    #         python('-c', 'import pynn_brainscales; print(pynn_brainscales.__file__)')