diff options
| author | Marie Houillon <houillonmarie@gmail.com> | 2024-03-24 00:35:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-24 00:35:32 +0100 |
| commit | 2f1186283200cd996f801dcb80cfbd05fbabedaf (patch) | |
| tree | bd1ed8a213ff0499b1c7f0d3f12d42e96c5c9f25 /var | |
| parent | bff11ce8e7ba4bfe5c69550359e7fa5c39fc4c20 (diff) | |
| download | spack-2f1186283200cd996f801dcb80cfbd05fbabedaf.tar.gz spack-2f1186283200cd996f801dcb80cfbd05fbabedaf.tar.bz2 spack-2f1186283200cd996f801dcb80cfbd05fbabedaf.tar.xz spack-2f1186283200cd996f801dcb80cfbd05fbabedaf.zip | |
openCARP: Add v15.0 packages (#43299)
Co-authored-by: openCARP consortium <info@opencarp.org>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/meshtool/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/opencarp/package.py | 9 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-carputils/package.py | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/meshtool/package.py b/var/spack/repos/builtin/packages/meshtool/package.py index bde4e0c990..6d3b107de5 100644 --- a/var/spack/repos/builtin/packages/meshtool/package.py +++ b/var/spack/repos/builtin/packages/meshtool/package.py @@ -16,6 +16,9 @@ class Meshtool(MakefilePackage): version("master", branch="master", preferred=True) # 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("oc12.0", commit="867431d6bde35ad41104f611aa57130ef58cfb79") version("oc11.0", commit="867431d6bde35ad41104f611aa57130ef58cfb79") diff --git a/var/spack/repos/builtin/packages/opencarp/package.py b/var/spack/repos/builtin/packages/opencarp/package.py index c6926bf064..3a299f75d1 100644 --- a/var/spack/repos/builtin/packages/opencarp/package.py +++ b/var/spack/repos/builtin/packages/opencarp/package.py @@ -19,13 +19,16 @@ class Opencarp(CMakePackage): maintainers("MarieHouillon") version( - "13.0", - commit="e1e0deca7eddcfd210835f54430361c85a97a5a4", + "15.0", + commit="2271a3cccd7137f1e28c043c10adbd80480f1462", submodules=False, no_cache=True, preferred=True, ) version( + "13.0", commit="e1e0deca7eddcfd210835f54430361c85a97a5a4", submodules=False, no_cache=True + ) + version( "12.0", commit="a34c11af3e8c2afd6e123e586a446c6993e0b039", submodules=False, no_cache=True ) version( @@ -66,7 +69,7 @@ class Opencarp(CMakePackage): depends_on("py-carputils", when="+carputils", type=("build", "run")) depends_on("meshtool", when="+meshtool", type=("build", "run")) # 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("meshtool@oc" + ver, when="@" + ver + " +meshtool") diff --git a/var/spack/repos/builtin/packages/py-carputils/package.py b/var/spack/repos/builtin/packages/py-carputils/package.py index 9a50582c53..8e6ecf335d 100644 --- a/var/spack/repos/builtin/packages/py-carputils/package.py +++ b/var/spack/repos/builtin/packages/py-carputils/package.py @@ -19,6 +19,7 @@ class PyCarputils(PythonPackage): version("master", branch="master") # Version to use with openCARP releases + version("oc15.0", commit="50e2580b3f75711388eb55982a9b43871c3201f3") version("oc13.0", commit="216c3802c2ac2d14c739164dcd57f2e59aa2ede3") version("oc12.0", commit="4d7a1f0c604a2ad232e70cf9aa3a8daff5ffb195") 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-matplotlib@3.0.0:", 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-pydoe@0.3.8", type=("build", "run")) depends_on("py-ruamel-yaml@0.17.4:", type=("build", "run")) |