From 46b9a098439db408ad1ccb2f235f53ce8c2d1b66 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 23 Nov 2022 19:44:20 -0600 Subject: py-cartopy: older versions don't support newer matplotlib (#34109) --- var/spack/repos/builtin/packages/py-cartopy/package.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py index e96291c4a4..4333888e80 100644 --- a/var/spack/repos/builtin/packages/py-cartopy/package.py +++ b/var/spack/repos/builtin/packages/py-cartopy/package.py @@ -62,7 +62,9 @@ class PyCartopy(PythonPackage): depends_on("py-numpy@1.13.3:", when="@0.19:", type=("build", "run")) depends_on("py-numpy@1.10:", when="@0.17:", type=("build", "run")) depends_on("py-numpy@1.6:", type=("build", "run")) - depends_on("py-matplotlib@3.1:", when="@0.20:", type=("build", "run")) + depends_on("py-matplotlib@3.1:", when="@0.21:", type=("build", "run")) + # https://github.com/SciTools/cartopy/issues/2086 + depends_on("py-matplotlib@3.1:3.5", when="@0.20", type=("build", "run")) depends_on("py-shapely@1.6.4:1", when="@0.20:", type=("build", "run")) depends_on("py-shapely@1.5.6:1", type=("build", "run")) depends_on("py-pyshp@2.1:", when="@0.20:", type=("build", "run")) @@ -91,8 +93,8 @@ class PyCartopy(PythonPackage): depends_on("pil@1.7.8:", type="run") depends_on("py-scipy@1.3.1:", when="@0.20:", type="run") depends_on("py-scipy@0.10:", type="run") - depends_on("py-matplotlib@1.5.1:", when="@0.17:0.19", type="run") - depends_on("py-matplotlib@1.3:", when="@0.16", type="run") + depends_on("py-matplotlib@1.5.1:3.5", when="@0.17:0.19", type="run") + depends_on("py-matplotlib@1.3:3.5", when="@0.16", type="run") patch("proj6.patch", when="@0.17.0") -- cgit v1.2.3-60-g2f50