From ba0d182e103f2dead098985c671323df6fe04dc2 Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Sat, 24 Dec 2022 03:22:19 +0100 Subject: Update py-meson-python (0.11.0, 0.12.0) and meson (0.64.1, 1.0.0) (#34675) * Update py-meson-python versions (0.11.0, 0.12.0) * Update `meson` to version 0.64.1 * Add Meson 1.0.0 * Apply code review suggestions --- var/spack/repos/builtin/packages/meson/package.py | 2 ++ .../repos/builtin/packages/py-meson-python/package.py | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/meson/package.py b/var/spack/repos/builtin/packages/meson/package.py index 29b32eae7e..0505c08f1d 100644 --- a/var/spack/repos/builtin/packages/meson/package.py +++ b/var/spack/repos/builtin/packages/meson/package.py @@ -18,6 +18,8 @@ class Meson(PythonPackage): maintainers = ["eli-schwartz", "michaelkuhn"] + version("1.0.0", sha256="a2ada84d43c7e57400daee80a880a1f5003d062b2cb6c9be1747b0db38f2eb8d") + version("0.64.1", sha256="1d12a4bc1cf3ab18946d12cf0b6452e5254ada1ad50aacc97f87e2cccd7da315") version("0.64.0", sha256="6477993d781b6efea93091616a6d6a0766c0e026076dbeb11249bf1c9b49a347") version("0.63.3", sha256="7c516c2099b762203e8a0a22412aa465b7396e6f9b1ab728bad6e6db44dc2659") version("0.63.2", sha256="023a3f7c74e68991154c3205a6975705861eedbf8130e013d15faa1df1af216e") diff --git a/var/spack/repos/builtin/packages/py-meson-python/package.py b/var/spack/repos/builtin/packages/py-meson-python/package.py index ba4f5e9df7..4c0a371100 100644 --- a/var/spack/repos/builtin/packages/py-meson-python/package.py +++ b/var/spack/repos/builtin/packages/py-meson-python/package.py @@ -9,11 +9,13 @@ from spack.package import * class PyMesonPython(PythonPackage): """Meson Python build backend (PEP 517).""" - homepage = "https://github.com/FFY00/mesonpy" + homepage = "https://github.com/mesonbuild/meson-python" pypi = "meson_python/meson_python-0.7.0.tar.gz" - maintainers = ["eli-schwartz", "adamjstewart"] + maintainers = ["eli-schwartz", "adamjstewart", "rgommers"] + version("0.12.0", sha256="8cb159a8093a2e73cfa897f8092ec93b74e3842f94dff7fde381c6fe0e0b064d") + version("0.11.0", sha256="110258837c2ffe762f5f855c7ea5385f1edd44074e93a0f317ffefc7aab42b09") version("0.10.0", sha256="08dd122c1074dbd5c55b53993a719cca73dd8216372c91217f7a550260f9e7e1") version("0.9.0", sha256="6aa5a09ff5cce1c5308938ebbf3eab5529413c8677055ace1ac8c83d8a07b29d") version("0.8.1", sha256="442f1fa4cf5db50eea61170a6059c10fafd70977f5dbdf3441c106cd23b05e4c") @@ -21,14 +23,18 @@ class PyMesonPython(PythonPackage): version("0.7.0", sha256="9fcfa350f44ca80dd4f5f9c3d251725434acf9a07d9618f382e6cc4629dcbe84") depends_on("python@3.7:", type=("build", "run")) - depends_on("meson@0.63:", when="@0.9:", type=("build", "run")) + depends_on("meson@0.63.3:", when="@0.11:", type=("build", "run")) + depends_on("meson@0.63:", when="@0.9:0.10", type=("build", "run")) depends_on("meson@0.62:", type=("build", "run")) + depends_on("py-pyproject-metadata@0.6.1:", when="@0.12:", type=("build", "run")) depends_on("py-pyproject-metadata@0.5:", type=("build", "run")) - depends_on("py-tomli@1:", type=("build", "run")) - depends_on("py-typing-extensions@3.7.4:", when="^python@:3.7", type=("build", "run")) + depends_on("py-tomli@1:", when="@0.11: ^python@:3.10", type=("build", "run")) + depends_on("py-tomli@1:", when="@:0.10", type=("build", "run")) + depends_on("py-typing-extensions@3.7.4:", when="@0.12: ^python@:3.9", type=("build", "run")) + depends_on("py-typing-extensions@3.7.4:", when="@:0.11 ^python@:3.7", type=("build", "run")) depends_on("py-colorama", when="platform=windows", type=("build", "run")) - # https://github.com/FFY00/meson-python/pull/111 + # https://github.com/mesonbuild/meson-python/pull/111 conflicts("platform=darwin os=ventura", when="@:0.7") conflicts("platform=darwin os=monterey", when="@:0.7") conflicts("platform=darwin os=bigsur", when="@:0.7") -- cgit v1.2.3-60-g2f50