From 5d685f9ff631090a4d4cd266c560cefdf6cd45d2 Mon Sep 17 00:00:00 2001 From: Marie Houillon Date: Wed, 1 Jun 2022 03:21:55 +0200 Subject: [PATCH] New version for openCARP packages (#30931) Co-authored-by: openCARP consortium --- var/spack/repos/builtin/packages/meshtool/package.py | 1 + var/spack/repos/builtin/packages/opencarp/package.py | 5 +++-- var/spack/repos/builtin/packages/py-carputils/package.py | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/meshtool/package.py b/var/spack/repos/builtin/packages/meshtool/package.py index 79546139a51..33d93b201d5 100644 --- a/var/spack/repos/builtin/packages/meshtool/package.py +++ b/var/spack/repos/builtin/packages/meshtool/package.py @@ -16,6 +16,7 @@ class Meshtool(MakefilePackage): version('master', branch='master') # Version to use with openCARP releases + version('oc10.0', commit='6c5cfbd067120901f15a04bf63beec409bda6dc9') version('oc9.0', commit='6c5cfbd067120901f15a04bf63beec409bda6dc9') version('oc8.2', commit='6c5cfbd067120901f15a04bf63beec409bda6dc9') version('oc8.1', commit="6c5cfbd067120901f15a04bf63beec409bda6dc9") diff --git a/var/spack/repos/builtin/packages/opencarp/package.py b/var/spack/repos/builtin/packages/opencarp/package.py index 8e328d1b286..be093c5c13b 100644 --- a/var/spack/repos/builtin/packages/opencarp/package.py +++ b/var/spack/repos/builtin/packages/opencarp/package.py @@ -18,7 +18,8 @@ class Opencarp(CMakePackage): maintainers = ['MarieHouillon'] - version('9.0', commit='c0167599', submodules=False, no_cache=True, preferred=True) + version('10.0', commit='7aec7900', submodules=False, no_cache=True, preferred=True) + version('9.0', commit='c0167599', submodules=False, no_cache=True) version('8.2', commit='dbfd16fd', submodules=False, no_cache=True) version('8.1', commit='28eb2e97', submodules=False, no_cache=True) version('7.0', commit='78da9195', submodules=False, no_cache=True) @@ -42,7 +43,7 @@ class Opencarp(CMakePackage): depends_on('py-carputils') depends_on('meshtool') # Use specific versions of carputils and meshtool for releases - for ver in ['9.0', '8.2', '7.0', '8.1']: + for ver in ['10.0', '9.0', '8.2', '7.0', '8.1']: 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 01ca756577c..c68eb3c2068 100644 --- a/var/spack/repos/builtin/packages/py-carputils/package.py +++ b/var/spack/repos/builtin/packages/py-carputils/package.py @@ -17,6 +17,7 @@ class PyCarputils(PythonPackage): version('master', branch='master') # Version to use with openCARP releases + version('oc10.0', commit='a02f9b846c6e852b7315b20e925d55c355f239b8') version('oc9.0', commit='e79e66b25c7bfaf405fad595019594ab9aa83392') version('oc8.2', commit='e60f639c0f39ad71c8ae11814de1f3aa726e8352') version('oc8.1', commit='a4210fcb0fe17226a1744ee9629f85b629decba3')