From 17ef2c4b1b68b297c4487606422421978dc59586 Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Tue, 2 Jul 2024 15:18:40 -0400 Subject: [PATCH 1/2] mepo: new package (#44879) * mepo: add new package * Add mepo 2.0.0rc4 * Update dependencies --- .../repos/builtin/packages/mepo/package.py | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/mepo/package.py b/var/spack/repos/builtin/packages/mepo/package.py index 3e947c6cb7b93d..6d124d2121f90e 100644 --- a/var/spack/repos/builtin/packages/mepo/package.py +++ b/var/spack/repos/builtin/packages/mepo/package.py @@ -1,4 +1,4 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) @@ -6,22 +6,22 @@ from spack.package import * -class Mepo(Package): +class Mepo(PythonPackage): """Tool to manage (m)ultiple git r(epo)sitories""" homepage = "https://github.com/GEOS-ESM/mepo" - url = "https://github.com/GEOS-ESM/mepo/archive/refs/tags/v1.51.1.tar.gz" + git = "https://github.com/GEOS-ESM/mepo.git" + pypi = "mepo/mepo-2.0.0rc4.tar.gz" - maintainers("mathomp4", "pchakraborty", "climbfuji") + maintainers("pchakraborty", "mathomp4") - version("1.52.0", sha256="553876e9ce13484e25abb2e93b261e9f69b529cd4a62070b23dcbd0115b89ad9") - version("1.51.1", sha256="543c1e7487afb2d62e5e8c8a2f69a85af1b1951f588f3dfc7471763e90847360") + license("Apache-2.0", checked_by="mathomp4") - depends_on("python", type="run") - depends_on("py-pyyaml@5.4:", type="run") + version("2.0.0rc4", sha256="5f6113be565c561c08114355570a259042b25222a9e8e1dc6e6e44448381cd36") + version("2.0.0rc3", sha256="c0c897a33f5018489e6cc14892961831c8922a3378ac30436496c52bf877aff7") - def install(self, spec, prefix): - mkdirp(prefix.bin) - install_tree(".", prefix) - # Symlink mepo to bin directory - symlink(join_path(prefix, "mepo"), join_path(prefix.bin, "mepo")) + depends_on("python@3.9:", type=("build", "run")) + depends_on("py-colorama@0.4.6:", type=("build", "run")) + depends_on("py-pyyaml@6.0.1:", type=("build", "run")) + + depends_on("py-hatchling", type="build") From 1ecb1631b15ee7dbf45057832cc7c01f6dcaabf5 Mon Sep 17 00:00:00 2001 From: Auriane R <48684432+aurianer@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:13:20 +0200 Subject: [PATCH 2/2] py-pyyaml: add v6.0.1 (#44906) --- var/spack/repos/builtin/packages/py-pyyaml/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/py-pyyaml/package.py b/var/spack/repos/builtin/packages/py-pyyaml/package.py index 048b3e7d9f6686..1e995439a2dbaf 100644 --- a/var/spack/repos/builtin/packages/py-pyyaml/package.py +++ b/var/spack/repos/builtin/packages/py-pyyaml/package.py @@ -15,6 +15,7 @@ class PyPyyaml(PythonPackage): license("MIT") + version("6.0.1", sha256="bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43") version("6.0", sha256="68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2") version("5.4.1", sha256="607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e") version("5.3.1", sha256="b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d")