From 9662d181a01785afecd2725dfe71dde2630b86da Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 18 Mar 2024 12:53:53 +0100 Subject: use directives in some packages (#43238) --- lib/spack/spack/directives.py | 6 +++--- var/spack/repos/builtin/packages/arbor/package.py | 2 +- var/spack/repos/builtin/packages/cubelib/package.py | 3 ++- var/spack/repos/builtin/packages/cubew/package.py | 3 ++- var/spack/repos/builtin/packages/dftbplus/package.py | 4 ++-- var/spack/repos/builtin/packages/lfortran/package.py | 2 +- var/spack/repos/builtin/packages/mruby/package.py | 3 +-- var/spack/repos/builtin/packages/nlcglib/package.py | 2 +- var/spack/repos/builtin/packages/rkt-racket-lib/package.py | 2 +- var/spack/repos/builtin/packages/rpp/package.py | 3 ++- var/spack/repos/builtin/packages/t8code/package.py | 2 +- var/spack/repos/builtin/packages/veloc/package.py | 2 +- 12 files changed, 18 insertions(+), 16 deletions(-) diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index 207624965d..0d4834ed13 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -921,9 +921,9 @@ def maintainers(*names: str): """ def _execute_maintainer(pkg): - maintainers_from_base = getattr(pkg, "maintainers", []) - # Here it is essential to copy, otherwise we might add to an empty list in the parent - pkg.maintainers = list(sorted(set(maintainers_from_base + list(names)))) + maintainers = set(getattr(pkg, "maintainers", [])) + maintainers.update(names) + pkg.maintainers = sorted(maintainers) return _execute_maintainer diff --git a/var/spack/repos/builtin/packages/arbor/package.py b/var/spack/repos/builtin/packages/arbor/package.py index c212d0247e..ca3651e4b3 100644 --- a/var/spack/repos/builtin/packages/arbor/package.py +++ b/var/spack/repos/builtin/packages/arbor/package.py @@ -13,8 +13,8 @@ class Arbor(CMakePackage, CudaPackage): homepage = "https://arbor-sim.org" git = "https://github.com/arbor-sim/arbor.git" url = "https://github.com/arbor-sim/arbor/releases/download/v0.8.1/arbor-v0.8.1-full.tar.gz" - maintainers = ["thorstenhater", "brenthuisman"] + maintainers("thorstenhater", "brenthuisman") license("BSD-3-Clause") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/cubelib/package.py b/var/spack/repos/builtin/packages/cubelib/package.py index 6c6f4036b3..c3c4734153 100644 --- a/var/spack/repos/builtin/packages/cubelib/package.py +++ b/var/spack/repos/builtin/packages/cubelib/package.py @@ -11,7 +11,8 @@ class Cubelib(AutotoolsPackage): homepage = "https://www.scalasca.org/software/cube-4.x/download.html" url = "https://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubelib-4.4.tar.gz" - maintainers = ("swat-jsc", "wrwilliams") + + maintainers("swat-jsc", "wrwilliams") version("4.8.2", sha256="d6fdef57b1bc9594f1450ba46cf08f431dd0d4ae595c47e2f3454e17e4ae74f4") version("4.8.1", sha256="e4d974248963edab48c5d0fc5831146d391b0ae4632cccafe840bf5f12cd80a9") diff --git a/var/spack/repos/builtin/packages/cubew/package.py b/var/spack/repos/builtin/packages/cubew/package.py index 34a7fccbef..a358aacd6f 100644 --- a/var/spack/repos/builtin/packages/cubew/package.py +++ b/var/spack/repos/builtin/packages/cubew/package.py @@ -11,7 +11,8 @@ class Cubew(AutotoolsPackage): homepage = "https://www.scalasca.org/software/cube-4.x/download.html" url = "https://apps.fz-juelich.de/scalasca/releases/cube/4.4/dist/cubew-4.4.tar.gz" - maintainers = ("swat-jsc", "wrwilliams") + + maintainers("swat-jsc", "wrwilliams") version("4.8.2", sha256="4f3bcf0622c2429b8972b5eb3f14d79ec89b8161e3c1cc5862ceda417d7975d2") version("4.8.1", sha256="42cbd743d87c16e805c8e28e79292ab33de259f2cfba46f2682cb35c1bc032d6") diff --git a/var/spack/repos/builtin/packages/dftbplus/package.py b/var/spack/repos/builtin/packages/dftbplus/package.py index 9357aaf4c2..1efaf68aa4 100644 --- a/var/spack/repos/builtin/packages/dftbplus/package.py +++ b/var/spack/repos/builtin/packages/dftbplus/package.py @@ -15,8 +15,8 @@ class Dftbplus(CMakePackage, MakefilePackage): url = "https://github.com/dftbplus/dftbplus/releases/download/22.1/dftbplus-22.1.tar.xz" git = "https://github.com/dftbplus/dftbplus.git" - maintainers = ["HaoZeke", "aradi", "iamashwin99"] - generator = "Ninja" + maintainers("HaoZeke", "aradi", "iamashwin99") + generator("ninja") build_system( conditional("cmake", when="@20.1:"), diff --git a/var/spack/repos/builtin/packages/lfortran/package.py b/var/spack/repos/builtin/packages/lfortran/package.py index ded409d067..50f157e1be 100644 --- a/var/spack/repos/builtin/packages/lfortran/package.py +++ b/var/spack/repos/builtin/packages/lfortran/package.py @@ -12,8 +12,8 @@ class Lfortran(CMakePackage): homepage = "https://lfortran.org" url = "https://lfortran.github.io/tarballs/release/lfortran-0.19.0.tar.gz" git = "https://github.com/lfortran/lfortran.git" - maintainers = ["certik"] + maintainers("certik") license("BSD-3-Clause") # The build process uses 'git describe --tags' to get the package version diff --git a/var/spack/repos/builtin/packages/mruby/package.py b/var/spack/repos/builtin/packages/mruby/package.py index 230a0b82e9..05a7f30f34 100644 --- a/var/spack/repos/builtin/packages/mruby/package.py +++ b/var/spack/repos/builtin/packages/mruby/package.py @@ -14,8 +14,7 @@ class Mruby(Package): url = "https://github.com/mruby/mruby/archive/refs/tags/3.0.0.tar.gz" git = "https://github.com/mruby/mruby.git" - maintainers = ["mdorier"] - + maintainers("mdorier") license("MIT") version("master", branch="master") diff --git a/var/spack/repos/builtin/packages/nlcglib/package.py b/var/spack/repos/builtin/packages/nlcglib/package.py index 3383621518..694fbbfc5c 100644 --- a/var/spack/repos/builtin/packages/nlcglib/package.py +++ b/var/spack/repos/builtin/packages/nlcglib/package.py @@ -13,7 +13,7 @@ class Nlcglib(CMakePackage, CudaPackage, ROCmPackage): git = "https://github.com/simonpintarelli/nlcglib.git" url = "https://github.com/simonpintarelli/nlcglib/archive/v0.9.tar.gz" - maintainers = ["simonpintarelli"] + maintainers("simonpintarelli") license("BSD-3-Clause") diff --git a/var/spack/repos/builtin/packages/rkt-racket-lib/package.py b/var/spack/repos/builtin/packages/rkt-racket-lib/package.py index 1dfed11df2..00861c615b 100644 --- a/var/spack/repos/builtin/packages/rkt-racket-lib/package.py +++ b/var/spack/repos/builtin/packages/rkt-racket-lib/package.py @@ -12,7 +12,7 @@ class RktRacketLib(RacketPackage): git = "ssh://git@github.com/racket/racket.git" - maintainers = ["elfprince13"] + maintainers("elfprince13") version("8.3", commit="cab83438422bfea0e4bd74bc3e8305e6517cf25f") # tag="v8.3" depends_on("racket@8.3", type=("build", "run"), when="@8.3") diff --git a/var/spack/repos/builtin/packages/rpp/package.py b/var/spack/repos/builtin/packages/rpp/package.py index d8f7cd059c..f30b4830e3 100644 --- a/var/spack/repos/builtin/packages/rpp/package.py +++ b/var/spack/repos/builtin/packages/rpp/package.py @@ -24,10 +24,11 @@ class Rpp(CMakePackage): url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/archive/{0}.tar.gz" return url.format(version) - maintainers = ["srekolam", "afzpatel"] tags = ["rocm"] + maintainers("srekolam", "afzpatel") license("MIT") + version("6.0.2", sha256="2686eb4099233db4444fcd2f77af9b00d38d829f05de2403bed37b1b28f2653c") version("6.0.0", sha256="3626a648bc773520f5cd5ca15f494de6e74b422baf32491750ce0737c3367f15") version("5.7.1", sha256="36fff5f1c52d969c3e2e0c75b879471f731770f193c9644aa6ab993fb8fa4bbf") diff --git a/var/spack/repos/builtin/packages/t8code/package.py b/var/spack/repos/builtin/packages/t8code/package.py index 9ba18b9993..79f3b07930 100644 --- a/var/spack/repos/builtin/packages/t8code/package.py +++ b/var/spack/repos/builtin/packages/t8code/package.py @@ -16,7 +16,7 @@ class T8code(AutotoolsPackage): homepage = "https://github.com/DLR-AMR/t8code" url = "https://github.com/DLR-AMR/t8code/releases/download/v1.4.1/t8-1.4.1.tar.gz" - maintainers = ["Davknapp", "melven"] + maintainers("Davknapp", "melven") license("GPL-2.0-or-later") diff --git a/var/spack/repos/builtin/packages/veloc/package.py b/var/spack/repos/builtin/packages/veloc/package.py index 2bb6f0840d..079d773d51 100644 --- a/var/spack/repos/builtin/packages/veloc/package.py +++ b/var/spack/repos/builtin/packages/veloc/package.py @@ -14,9 +14,9 @@ class Veloc(CMakePackage): url = "https://github.com/ECP-VeloC/VELOC/archive/veloc-1.7.tar.gz" git = "https://github.com/ecp-veloc/veloc.git" - maintainers = ["bnicolae"] tags = ["e4s"] + maintainers("bnicolae") license("MIT") version("main", branch="main") -- cgit v1.2.3-70-g09d2