tfel and mgis: add new versions and fix tests (#27011)

Co-authored-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>

2 files changed, 56 insertions, 2 deletions

diff --git a/var/spack/repos/builtin/packages/mgis/package.py b/var/spack/repos/builtin/packages/mgis/package.py
index 79633592dd..622ffcd5a0 100644
--- a/var/spack/repos/builtin/packages/mgis/package.py
+++ b/var/spack/repos/builtin/packages/mgis/package.py
@@ -24,11 +24,16 @@ class Mgis(CMakePackage):
 
     # development branches
     version("master", branch="master")
+    version("rliv-2.0", branch="rliv-2.0")
     version("rliv-1.2", branch="rliv-1.2")
     version("rliv-1.1", branch="rliv-1.1")
     version("rliv-1.0", branch="rliv-1.0")
 
     # released version
+    version('2.0',   sha256='cb427d77f2c79423e969815b948a8b44da33a4370d1760e8c1e22a569f3585e2',
+            preferred=True)
+    version('1.2.2', sha256='dc24e85cc90ec656ed707eef3d511317ad800915014d9e4e9cf8818b406586d5')
+    version('1.2.1', sha256='a2d7cae3a24546adcf1d1bf7f13f012170d359370f5b6b2c1730b19eb507601d')
     version('1.2',   sha256='ed82ab91cbe17c00ef36578dbfcb4d1817d4c956619b7cccbea3e3f1a3b31940')
     version('1.1',   sha256='06593d7a052678deaee87ef60b2213db7545c5be9823f261d3388b3978a0b7a5')
     version('1.0.1', sha256='6102621455bc5d9b1591cd33e93b2e15a9572d2ce59ca6dfa30ba57ae1265c08')
@@ -46,6 +51,9 @@ class Mgis(CMakePackage):
             values=('Debug', 'Release'))
 
     # dependencies
+    depends_on('tfel@4.0.0', when="@2.0")
+    depends_on('tfel@3.4.3', when="@1.2.2")
+    depends_on('tfel@3.4.1', when="@1.2.1")
     depends_on('tfel@3.4.0', when="@1.2")
     depends_on('tfel@3.3.0', when="@1.1")
     depends_on('tfel@3.2.1', when="@1.0.1")
@@ -57,6 +65,18 @@ class Mgis(CMakePackage):
     depends_on('boost+python+numpy', when='+python')
     extends('python', when='+python')
 
+    def patch(self):
+        """Fix the test suite to use the PYTHONPATH provided by the spack buildenv"""
+        filter_file('tests/;', 'tests:', 'bindings/python/tests/CMakeLists.txt')
+
+    def check(self):
+        """skip target 'test' which doesn't build the test programs used by tests"""
+        with working_dir(self.build_directory):
+            if self.generator == 'Unix Makefiles':
+                self._if_make_target_execute('check')
+            elif self.generator == 'Ninja':
+                self._if_ninja_target_execute('check')
+
     def cmake_args(self):
 
         args = []
diff --git a/var/spack/repos/builtin/packages/tfel/package.py b/var/spack/repos/builtin/packages/tfel/package.py
index f03ea3f616..1d8349b595 100644
--- a/var/spack/repos/builtin/packages/tfel/package.py
+++ b/var/spack/repos/builtin/packages/tfel/package.py
@@ -29,12 +29,13 @@ class Tfel(CMakePackage):
     """
 
     homepage = "http://tfel.sourceforge.net"
-    url      = "https://github.com/thelfer/tfel/archive/TFEL-3.4.0.tar.gz"
+    url      = "https://github.com/thelfer/tfel/archive/TFEL-4.0.tar.gz"
     git      = "https://github.com/thelfer/tfel.git"
     maintainers = ['thelfer']
 
     # development branches
     version("master", branch="master")
+    version("rliv-4.0", branch="rliv-4.0")
     version("rliv-3.4", branch="rliv-3.4")
     version("rliv-3.3", branch="rliv-3.3")
     version("rliv-3.2", branch="rliv-3.2")
@@ -44,18 +45,39 @@ class Tfel(CMakePackage):
     version("rliv-1.2", branch="rliv-1.2")
 
     # released version
+    version('4.0.0', sha256='7a0c32c8a9cd2fd65cbcb54fff802f303665d7cba5d46f92ff3d55f057c92845',
+            preferred=True)
+    version('3.4.3', sha256='e58515effe57d473385fe0b592d9e1d1286c0901496c61268d9efd92a2550849')
+    version('3.4.2', sha256='f39e65b2282fd3b108081388f161ba662407b192fed68fafe324c7528026a202')
+    version('3.4.1', sha256='04cd4257e39e1b05e02b12ad941106fff4d439934bdfe6e950c08bab23e2a4ba')
     version('3.4.0', sha256='176feb4c1726d0f21f4c656b20620dce6f99ab7f5f09a66905aeb643a316bbc1')
+    version('3.3.3', sha256='5a1fb43a8086e594e0a7234c1f227e6e005d384fd84affe3acadccb68fe2bbf6')
+    version('3.3.2', sha256='17127ffdf92367c10041258f70a88ac3dcb0a7d89c1766a6aa1ebaeb4d03d55d')
     version('3.3.1', sha256='ad07329c25874832fbacc999b5f88d9b9ab84415bc897a6f3cae5b4afcd7661f')
     version('3.3.0', sha256='884ad68b0fbbededc3a602d559433c24114ae4534dc9f0a759d31ca3589dace0')
+    version('3.2.6', sha256='ae80c76d92aeae207e307436aed32bbaed913a437ae57b5ee128ce4f543f20a9')
+    version('3.2.5', sha256='194e799ca8d2f7ffea25aa3842c48cfc12850c252d851ce03941b5e3ae533b21')
+    version('3.2.4', sha256='e7ac7e61fb3e02301285885bb3dc81ca1b09bd6e2929d15c755555d66088fe33')
+    version('3.2.3', sha256='ac429c50ad1901d9d6e518a1cf6505d7a404c21d8ad3c6e5b0acecc77f20e3f7')
     version('3.2.2', sha256='69b01ae0d1f9140b619aaa9135948284ff40d4654672c335e55ab4934c02eb43')
     version('3.2.1', sha256='12786480524a7fe86889120fb334fa00211dfd44ad5ec71e2279e7adf1ddc807')
     version('3.2.0', sha256='089d79745e9f267a2bd03dcd8841d484e668bd27f5cc2ff7453634cb39016848')
+    version('3.1.10', sha256='635a2507f139bb6d893e0a7bb223cd1d9ddab5dfddee179a3b2e9f8b0b63e065')
+    version('3.1.9', sha256='8aeb020beddd125c207271e01d3e7d3985a91268dbf0bbc6132d217cc72b12a8')
+    version('3.1.8', sha256='8c99ef80a27b3e791d78de2ceb1111396989942424697eccbc886edc3983163f')
+    version('3.1.7', sha256='9cd8beab96c8f9cc5647a3452e61b06968a172f5875a72db227e6148fdbf294c')
+    version('3.1.6', sha256='27684884cff441a6c548ffe5d88e35e2b532ed100c97e3125e89c82985a08c50')
     version('3.1.5', sha256='e22cf2110f19666f004b8acda32e87beae74721f82e7f83fd0c4fafb86812763')
     version('3.1.4', sha256='8dc2904fc930636976baaf7e91ac89c0377afb1629c336343dfad8ab651cf87d')
     version('3.1.3', sha256='2022fa183d2c2902ada982ec6550ebe15befafcb748fd988fc9accdde7976a42')
     version('3.1.2', sha256='2eaa191f0699031786d8845ac769320a42c7e035991d82b3738289886006bfba')
     version('3.1.1', sha256='a4c0c21c6c22752cc90c82295a6bafe637b3395736c66fcdfcfe4aeccb5be7af')
     version('3.1.0', sha256='dd67b400b5f157aef503aa3615b9bf6b52333876a29e75966f94ee3f79ab37ad')
+    version('3.0.10', sha256='1604f22948b4af6ef84839d97909f7011ce614254e1a6de092ddc61832f7d343')
+    version('3.0.9', sha256='461dbb9e78fb6de9eaff21e387f5441020a077bba51d47b6510f11312e5ee333')
+    version('3.0.8', sha256='3639f11d14278e20814e8673e097d26161e26117128289516be5b1b1e1387e57')
+    version('3.0.7', sha256='4f4e04a1c1f360f27bbd4f72268dd31b46e2cef676ea8d36c35f21569540c76f')
+    version('3.0.6', sha256='3359e928dbde0f9ddbc9cd62bd2c2dbafe38543aad68fda9f3768fcc5c219f66')
     version('3.0.5', sha256='abf58f87962cf98b6129e873a841819a2a751f2ebd4e08490eb89fb933cd7887')
     version('3.0.4', sha256='e832d421a0dc9f315c60c5ea23f958dcaa299913c50a4eb73bde0e053067a3cc')
     version('3.0.3', sha256='3ff1c14bcc27e9b615aab5748eaf3afac349050b27b55a2b57648aba28b801ac')
@@ -106,10 +128,14 @@ class Tfel(CMakePackage):
                type=('build', 'link', 'run'))
     depends_on('python', when='+python_bindings',
                type=('build', 'link', 'run'))
-    depends_on('boost+python+numpy', when='+python_bindings')
+    # As boost+py has py runtime dependency, boost+py needs types link and run as well:
+    depends_on('boost+python+numpy', when='+python_bindings',
+               type=('build', 'link', 'run'))
 
     extends('python', when='+python_bindings')
 
+    conflicts('%gcc@:7', when='@4:')
+
     def cmake_args(self):
 
         args = []
@@ -151,3 +177,11 @@ class Tfel(CMakePackage):
             args.append('-DBoost_NO_BOOST_CMAKE=ON')
 
         return args
+
+    def check(self):
+        """Skip the target 'test' which doesn't build all test programs used by tests"""
+        with working_dir(self.build_directory):
+            if self.generator == 'Unix Makefiles':
+                self._if_make_target_execute('check')
+            elif self.generator == 'Ninja':
+                self._if_ninja_target_execute('check')