From 508fcd82402e148f54bed668c1cba5f5f48601a1 Mon Sep 17 00:00:00 2001 From: Ben Cowan Date: Fri, 27 Jan 2023 14:11:21 -0700 Subject: Added newer versions of PyAMG and added dependencies for 4.2 and later. (#35185) * Added newer versions of PyAMG and added dependencies for 4.2 and later. * Fixed dependencies. --- var/spack/repos/builtin/packages/py-pyamg/package.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-pyamg/package.py b/var/spack/repos/builtin/packages/py-pyamg/package.py index 71fdfb202a..d8f036cc3b 100644 --- a/var/spack/repos/builtin/packages/py-pyamg/package.py +++ b/var/spack/repos/builtin/packages/py-pyamg/package.py @@ -11,15 +11,19 @@ class PyPyamg(PythonPackage): a convenient Python interface.""" homepage = "https://github.com/pyamg/pyamg" - url = "https://github.com/pyamg/pyamg/archive/v4.0.0.zip" + url = "https://github.com/pyamg/pyamg/archive/refs/tags/v4.0.0.zip" # A list of GitHub accounts to notify when the package is updated. maintainers = ["benc303"] + version("4.2.3", sha256="dcf23808e0e8edf177fc4f71a6b36e0823ffb117137a33a9eee14b391ddbb733") + version("4.1.0", sha256="9e340aef5da11280a1e28f28deeaac390f408e38ee0357d0fdbb77503747bbc4") version("4.0.0", sha256="015d5e706e6e54d3de82e05fdb173c30d8b27cb8a117ab584cd62ad41d9ea042") # Dependencies. A generic python dependency is added implicity by the # PythonPackage class. - depends_on("py-setuptools", type="build") - depends_on("py-numpy", type=("build", "run")) - depends_on("py-scipy", type=("build", "run")) + depends_on("py-numpy@1.7:", type=("build", "run")) + depends_on("py-scipy@0.12:", type=("build", "run")) + depends_on("py-setuptools@42:", type="build", when="@4.2.0:") + depends_on("py-setuptools-scm@5:+toml", type="build", when="@4.2.0:") + depends_on("py-pybind11@2.8.0:", type=("build"), when="@4.2.0:") -- cgit v1.2.3-70-g09d2