diff options
| author | Marie Houillon <marie.houillon@kit.edu> | 2022-03-04 11:31:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 11:31:18 +0100 |
| commit | 258600eede214cecf63a81f1d01964353f247ef4 (patch) | |
| tree | d3bf385e8acbc72baa98c563776c5acc2e7fde15 /var | |
| parent | b7794cdac8de9eca93f7678c93d95368bba2a820 (diff) | |
| download | spack-258600eede214cecf63a81f1d01964353f247ef4.tar.gz spack-258600eede214cecf63a81f1d01964353f247ef4.tar.bz2 spack-258600eede214cecf63a81f1d01964353f247ef4.tar.xz spack-258600eede214cecf63a81f1d01964353f247ef4.zip | |
New version for openCARP packages, v9.0 (#29150)
Co-authored-by: openCARP consortium <info@opencarp.org>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/meshtool/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/opencarp/package.py | 7 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-carputils/package.py | 13 |
3 files changed, 12 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/meshtool/package.py b/var/spack/repos/builtin/packages/meshtool/package.py index fa377c40ab..8d189600e8 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('oc9.0', commit='6c5cfbd067120901f15a04bf63beec409bda6dc9') version('oc8.2', commit='6c5cfbd067120901f15a04bf63beec409bda6dc9') version('oc8.1', commit="6c5cfbd067120901f15a04bf63beec409bda6dc9") version('oc7.0', commit="6c5cfbd067120901f15a04bf63beec409bda6dc9") diff --git a/var/spack/repos/builtin/packages/opencarp/package.py b/var/spack/repos/builtin/packages/opencarp/package.py index 2bcf7ef08f..4d5a132e21 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('8.2', commit='dbfd16fd', submodules=False, no_cache=True, preferred=True) + version('9.0', commit='c0167599', submodules=False, no_cache=True, preferred=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) version('master', branch='master', submodules=False, no_cache=True) @@ -34,14 +35,14 @@ class Opencarp(CMakePackage): depends_on('binutils') depends_on('gengetopt') depends_on('pkgconfig') - depends_on('python@:3.8') + depends_on('python') depends_on('zlib') depends_on('perl') depends_on('py-carputils') depends_on('meshtool') # Use specific versions of carputils and meshtool for releases - for ver in ['8.2', '7.0', '8.1']: + for ver in ['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 6cc5feed1c..5c0cc6ecca 100644 --- a/var/spack/repos/builtin/packages/py-carputils/package.py +++ b/var/spack/repos/builtin/packages/py-carputils/package.py @@ -14,20 +14,21 @@ class PyCarputils(PythonPackage): version('master', branch='master') # Version to use with openCARP releases + version('oc9.0', commit='e79e66b25c7bfaf405fad595019594ab9aa83392') version('oc8.2', commit='e60f639c0f39ad71c8ae11814de1f3aa726e8352') version('oc8.1', commit='a4210fcb0fe17226a1744ee9629f85b629decba3') version('oc7.0', commit='4c04db61744f2fb7665594d7c810699c5c55c77c') depends_on('git') - depends_on('python@:3.8', type=('build', 'run')) + depends_on('python', type=('build', 'run')) depends_on('py-pip', type='build') depends_on('py-numpy@1.14.5:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-python-dateutil', type='run') - depends_on('py-scipy@:1.5.4', type='run') - depends_on('py-matplotlib@:3.3.3', type='run') - depends_on('py-pandas@:1.1.4', type='run') - depends_on('py-tables@3.6.1', type='run') - depends_on('py-six@:1.14.0', type='run') + depends_on('py-scipy@1.5.0:', type='run') + depends_on('py-matplotlib@3.0.0:', type='run') + depends_on('py-pandas', type='run') + depends_on('py-tables@3.6.1:', type='run') + depends_on('py-six@1.12.0:', type='run') depends_on('py-ruamel-yaml', type='run') |