From 12427c6974c644ca6c45ffd62207dbec32625e79 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 5 Jul 2023 11:48:13 +0200 Subject: plumed: deprecate non-buildable versions, patch Python makefile only when supported (#38713) --- var/spack/repos/builtin/packages/plumed/package.py | 56 ++++++++++++++++++---- 1 file changed, 47 insertions(+), 9 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/plumed/package.py b/var/spack/repos/builtin/packages/plumed/package.py index fe57c4c48a..836f7e4850 100644 --- a/var/spack/repos/builtin/packages/plumed/package.py +++ b/var/spack/repos/builtin/packages/plumed/package.py @@ -58,18 +58,55 @@ class Plumed(AutotoolsPackage): version("2.5.2", sha256="85d10cc46e2e37c7719cf51c0931278f56c2c8f8a9d86188b2bf97c2535a2ab4") version("2.5.1", sha256="de309980dcfd6f6e0e70e138856f4bd9eb4d8a513906a5e6389f18a5af7f2eba") version("2.5.0", sha256="53e08187ec9f8af2326fa84407e34644a7c51d2af93034309fb70675eee5e4f7") - version("2.4.6", sha256="c22ad19f5cd36ce9fe4ba0b53158fc2a3d985c48fc04606e3f3b3e835b994cb3") - version("2.4.4", sha256="1e5c24109314481fad404da97d61c7339b219e27e120c9c80bacc79c9f6a51a8") - version("2.4.2", sha256="528ce57f1f5330480bcd403140166a4580efd2acaea39c85dfeca5e2cd649321") - version("2.4.1", sha256="f00410ebdd739c2ddf55fcd714ff4bd88a1029e02d2fc9cea0b5fca34e0fc4eb") + # These versions don't build in CI. + version( + "2.4.6", + sha256="c22ad19f5cd36ce9fe4ba0b53158fc2a3d985c48fc04606e3f3b3e835b994cb3", + deprecated=True, + ) + version( + "2.4.4", + sha256="1e5c24109314481fad404da97d61c7339b219e27e120c9c80bacc79c9f6a51a8", + deprecated=True, + ) + version( + "2.4.2", + sha256="528ce57f1f5330480bcd403140166a4580efd2acaea39c85dfeca5e2cd649321", + deprecated=True, + ) + version( + "2.4.1", + sha256="f00410ebdd739c2ddf55fcd714ff4bd88a1029e02d2fc9cea0b5fca34e0fc4eb", + deprecated=True, + ) - version("2.3.5", sha256="a6a66ca4582c1aecc6138c96be015e13cd06a718e8446b2f13e610fe34602e4f") - version("2.3.3", sha256="ac058ff529f207d5b4169fb5a87bdb3c77307dfef1ac543ad8b6c74c5de7fc91") - version("2.3.0", sha256="b1c8a54a313a0569e27e36420770074f35406453f73de70e55c424652abeddf1") + version( + "2.3.5", + sha256="a6a66ca4582c1aecc6138c96be015e13cd06a718e8446b2f13e610fe34602e4f", + deprecated=True, + ) + version( + "2.3.3", + sha256="ac058ff529f207d5b4169fb5a87bdb3c77307dfef1ac543ad8b6c74c5de7fc91", + deprecated=True, + ) + version( + "2.3.0", + sha256="b1c8a54a313a0569e27e36420770074f35406453f73de70e55c424652abeddf1", + deprecated=True, + ) - version("2.2.4", sha256="d7a1dba34a7fe03f23e8d39ab6e15b230c4851373fdceb3602e2de26ea53ce37") - version("2.2.3", sha256="2db19c5f6a2918833941d0bf47b5431d0865529d786df797ccc966d763ed7b0c") + version( + "2.2.4", + sha256="d7a1dba34a7fe03f23e8d39ab6e15b230c4851373fdceb3602e2de26ea53ce37", + deprecated=True, + ) + version( + "2.2.3", + sha256="2db19c5f6a2918833941d0bf47b5431d0865529d786df797ccc966d763ed7b0c", + deprecated=True, + ) # Variants. PLUMED by default builds a number of optional modules. # The ones listed here are not built by default for various reasons, @@ -210,6 +247,7 @@ class Plumed(AutotoolsPackage): # provided by optimized libraries due to linking order filter_file("-lgslcblas", "", "configure.ac") + @when("@2.5:") def patch(self): # Ensure Spack's wrappers are used to compile the Python interface env = ( -- cgit v1.2.3-70-g09d2