hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openCARP: Add v15.0 packages (#43299)

Browse source 
Co-authored-by: openCARP consortium <info@opencarp.org>
This commit is contained in:
Marie Houillon 2024-03-24 00:35:32 +01:00 committed by GitHub
parent bff11ce8e7
commit 2f11862832
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
var/spack/repos/builtin/packages/meshtool/package.py
View file

@ -16,6 +16,9 @@ class Meshtool(MakefilePackage):
version("master", branch="master", preferred=True) version("master", branch="master", preferred=True)
# Version to use with openCARP releases # Version to use with openCARP releases
# It is possible that different openCARP releases rely on the same
# meshtool version
version("oc15.0", commit="867431d6bde35ad41104f611aa57130ef58cfb79")
version("oc13.0", commit="867431d6bde35ad41104f611aa57130ef58cfb79") version("oc13.0", commit="867431d6bde35ad41104f611aa57130ef58cfb79")
version("oc12.0", commit="867431d6bde35ad41104f611aa57130ef58cfb79") version("oc12.0", commit="867431d6bde35ad41104f611aa57130ef58cfb79")
version("oc11.0", commit="867431d6bde35ad41104f611aa57130ef58cfb79") version("oc11.0", commit="867431d6bde35ad41104f611aa57130ef58cfb79")

9
var/spack/repos/builtin/packages/opencarp/package.py
View file

@ -19,12 +19,15 @@ class Opencarp(CMakePackage):
maintainers("MarieHouillon") maintainers("MarieHouillon")
version( version(
"13.0", "15.0",
commit="e1e0deca7eddcfd210835f54430361c85a97a5a4", commit="2271a3cccd7137f1e28c043c10adbd80480f1462",
submodules=False, submodules=False,
no_cache=True, no_cache=True,
preferred=True, preferred=True,
) )
version(
"13.0", commit="e1e0deca7eddcfd210835f54430361c85a97a5a4", submodules=False, no_cache=True
)
version( version(
"12.0", commit="a34c11af3e8c2afd6e123e586a446c6993e0b039", submodules=False, no_cache=True "12.0", commit="a34c11af3e8c2afd6e123e586a446c6993e0b039", submodules=False, no_cache=True
) )
@ -66,7 +69,7 @@ class Opencarp(CMakePackage):
depends_on("py-carputils", when="+carputils", type=("build", "run")) depends_on("py-carputils", when="+carputils", type=("build", "run"))
depends_on("meshtool", when="+meshtool", type=("build", "run")) depends_on("meshtool", when="+meshtool", type=("build", "run"))
# Use specific versions of carputils and meshtool for releases # Use specific versions of carputils and meshtool for releases
for ver in ["13.0", "12.0", "11.0", "10.0", "9.0", "8.2", "7.0", "8.1"]: for ver in ["15.0", "13.0", "12.0", "11.0", "10.0", "9.0", "8.2", "8.1", "7.0"]:
depends_on("py-carputils@oc" + ver, when="@" + ver + " +carputils") depends_on("py-carputils@oc" + ver, when="@" + ver + " +carputils")
depends_on("meshtool@oc" + ver, when="@" + ver + " +meshtool") depends_on("meshtool@oc" + ver, when="@" + ver + " +meshtool")

3
var/spack/repos/builtin/packages/py-carputils/package.py
View file

@ -19,6 +19,7 @@ class PyCarputils(PythonPackage):
version("master", branch="master") version("master", branch="master")
# Version to use with openCARP releases # Version to use with openCARP releases
version("oc15.0", commit="50e2580b3f75711388eb55982a9b43871c3201f3")
version("oc13.0", commit="216c3802c2ac2d14c739164dcd57f2e59aa2ede3") version("oc13.0", commit="216c3802c2ac2d14c739164dcd57f2e59aa2ede3")
version("oc12.0", commit="4d7a1f0c604a2ad232e70cf9aa3a8daff5ffb195") version("oc12.0", commit="4d7a1f0c604a2ad232e70cf9aa3a8daff5ffb195")
version("oc11.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8") version("oc11.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8")
@ -36,7 +37,7 @@ class PyCarputils(PythonPackage):
depends_on("py-scipy@1.5.0:", type=("build", "run")) depends_on("py-scipy@1.5.0:", type=("build", "run"))
depends_on("py-matplotlib@3.0.0:", type=("build", "run")) depends_on("py-matplotlib@3.0.0:", type=("build", "run"))
depends_on("py-pandas", type=("build", "run")) depends_on("py-pandas", type=("build", "run"))
depends_on("py-tables@3.6.1:", type=("build", "run")) depends_on("py-tables@3.8.0:", type=("build", "run"))
depends_on("py-six@1.12.0:", type=("build", "run")) depends_on("py-six@1.12.0:", type=("build", "run"))
depends_on("py-pydoe@0.3.8", type=("build", "run")) depends_on("py-pydoe@0.3.8", type=("build", "run"))
depends_on("py-ruamel-yaml@0.17.4:", type=("build", "run")) depends_on("py-ruamel-yaml@0.17.4:", type=("build", "run"))