From a42108438dee05140e785804a16699debb00e8ea Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 5 Sep 2024 22:16:14 +0200 Subject: [PATCH] py-contourpy: add v1.3.0 (#46225) --- .../builtin/packages/py-contourpy/package.py | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-contourpy/package.py b/var/spack/repos/builtin/packages/py-contourpy/package.py index 963e3e1255f..4020cbf679b 100644 --- a/var/spack/repos/builtin/packages/py-contourpy/package.py +++ b/var/spack/repos/builtin/packages/py-contourpy/package.py @@ -14,17 +14,31 @@ class PyContourpy(PythonPackage): license("BSD-3-Clause") + version("1.3.0", sha256="7ffa0db17717a8ffb127efd0c95a4362d996b892c2904db72428d5b52e1938a4") version("1.0.7", sha256="d8165a088d31798b59e91117d1f5fc3df8168d8b48c4acc10fc0df0d0bdbcc5e") version("1.0.5", sha256="896631cd40222aef3697e4e51177d14c3709fda49d30983269d584f034acc8a4") - depends_on("cxx", type="build") # generated + depends_on("cxx", type="build") + + with default_args(type="build"): + depends_on("meson@1.2:") + depends_on("py-meson-python@0.13.1:") + depends_on("py-pybind11@2.13.1:", when="@1.3:") + depends_on("py-pybind11@2.6:") + + # Historical dependencies + depends_on("py-setuptools@42:", when="@:1.0") + depends_on("py-build", when="@:1.0.5") + + with default_args(type=("build", "link", "run")): + depends_on("python@3.9:", when="@1.3:") + depends_on("python@3.8:", when="@1.0.7:") + depends_on("python@3.7:") + + with default_args(type=("build", "run")): + depends_on("py-numpy@1.23:", when="@1.3:") + depends_on("py-numpy@1.16:") - depends_on("python@3.8:", when="@1.0.7:", type=("build", "link", "run")) - depends_on("python@3.7:", type=("build", "link", "run")) - depends_on("py-pybind11@2.6:", type=("build", "link")) - depends_on("py-setuptools@42:", type="build") - depends_on("py-numpy@1.16:", type=("build", "run")) # https://github.com/numpy/numpy/issues/26191 - depends_on("py-numpy@:1", when="@:1.2.0", type=("build", "run")) - - depends_on("py-build", when="@:1.0.5", type="build") + conflicts("py-numpy@2:", when="@:1.2.0") + conflicts("py-pybind11@2.13.3")