py-cartopy: add v0.24.0 (#46851)

* py-cartopy: add v0.24.0
* py-owslib: add v0.31.0

2 files changed, 27 insertions, 7 deletions

diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py
index a31c1c5019..f0ef205e5a 100644
--- a/var/spack/repos/builtin/packages/py-cartopy/package.py
+++ b/var/spack/repos/builtin/packages/py-cartopy/package.py
@@ -10,13 +10,14 @@ class PyCartopy(PythonPackage):
     """Cartopy - a cartographic python library with matplotlib support."""
 
     homepage = "https://scitools.org.uk/cartopy/docs/latest/"
-    pypi = "Cartopy/Cartopy-0.20.2.tar.gz"
+    pypi = "Cartopy/cartopy-0.20.2.tar.gz"
 
     maintainers("adamjstewart")
     skip_modules = ["cartopy.tests"]
 
     license("LGPL-3.0-or-later")
 
+    version("0.24.0", sha256="e044e0e0fa76bb7afde937bec541743dcbf6b6f23b933a21ebddcd20cfffb755")
     version("0.23.0", sha256="231f37b35701f2ba31d94959cca75e6da04c2eea3a7f14ce1c75ee3b0eae7676")
     version("0.22.0", sha256="b300f90120931d43f11ef87c064ea1dacec1b59a4940aa76ebf82cf09548bb49")
     version("0.21.1", sha256="89d5649712c8582231c6e11825a04c85f6f0cee94dbb89e4db23eabca1cc250a")
@@ -32,7 +33,7 @@ class PyCartopy(PythonPackage):
     version("0.17.0", sha256="424bd9e9ddef6e48cbdee694ce589ec431be8591f15b6cb93cb2b333a29b2c61")
     version("0.16.0", sha256="f23dffa101f43dd91e866a49ebb5f5048be2a24ab8a921a5c07edabde746d9a4")
 
-    depends_on("cxx", type="build")  # generated
+    depends_on("cxx", type="build")
 
     variant("epsg", default=False, when="@:0.19", description="Add support for epsg.io")
     variant(
@@ -44,7 +45,8 @@ class PyCartopy(PythonPackage):
 
     # Based on wheel availability on PyPI
     with default_args(type=("build", "link", "run")):
-        depends_on("python@3.9:3.12", when="@0.23:")
+        depends_on("python@3.10:3.12", when="@0.24:")
+        depends_on("python@3.9:3.12", when="@0.23")
         depends_on("python@3.9:3.11", when="@0.22")
         depends_on("python@3.8:3.11", when="@0.21")
         depends_on("python@:3.11", when="@0.20")
@@ -64,7 +66,8 @@ class PyCartopy(PythonPackage):
         depends_on("py-setuptools-scm", when="@0.19:")
 
     with default_args(type=("build", "link", "run")):
-        depends_on("py-numpy@1.21:", when="@0.22:")
+        depends_on("py-numpy@1.23:", when="@0.24:")
+        depends_on("py-numpy@1.21:", when="@0.22:0.23")
         depends_on("py-numpy@1.18:", when="@0.20:21")
         depends_on("py-numpy@1.13.3:", when="@0.19")
         depends_on("py-numpy@1.10:", when="@0.17:0.18")
@@ -73,15 +76,18 @@ class PyCartopy(PythonPackage):
         depends_on("py-numpy@:1", when="@:0.22")
 
     with default_args(type=("build", "run")):
+        depends_on("py-matplotlib@3.6:", when="@0.24:")
         depends_on("py-matplotlib@3.5:", when="@0.23:")
         depends_on("py-matplotlib@3.4:", when="@0.22:")
         depends_on("py-matplotlib@3.1:", when="@0.21")
         # https://github.com/SciTools/cartopy/issues/2086
         depends_on("py-matplotlib@3.1:3.5", when="@0.20")
+        depends_on("py-shapely@1.8:", when="@0.24:")
         depends_on("py-shapely@1.7:", when="@0.22:")
         depends_on("py-shapely@1.6.4:", when="@0.21.1:0.21")
         depends_on("py-shapely@1.6.4:1", when="@0.20:0.21.0")
         depends_on("py-shapely@1.5.6:1", when="@:0.19")
+        depends_on("py-packaging@21:", when="@0.24:")
         depends_on("py-packaging@20:", when="@0.22:")
         depends_on("py-pyshp@2.3:", when="@0.23:")
         depends_on("py-pyshp@2.1:", when="@0.20:")
@@ -93,15 +99,19 @@ class PyCartopy(PythonPackage):
 
     with default_args(type="run"):
         with when("+ows"):
+            depends_on("py-owslib@0.27:", when="@0.24:")
             depends_on("py-owslib@0.20:", when="@0.22:")
             depends_on("py-owslib@0.18:", when="@0.20:")
             depends_on("py-owslib@0.8.11:")
+            depends_on("pil@9.1:", when="@0.24:")
             depends_on("pil@6.1:", when="@0.20:")
             depends_on("pil@1.7.8:")
 
         with when("+plotting"):
+            depends_on("pil@9.1:", when="@0.24:")
             depends_on("pil@6.1:", when="@0.20:")
             depends_on("pil@1.7.8:")
+            depends_on("py-scipy@1.9:", when="@0.24:")
             depends_on("py-scipy@1.3.1:", when="@0.20:")
             depends_on("py-scipy@0.10:")
 
@@ -126,6 +136,14 @@ class PyCartopy(PythonPackage):
 
     patch("proj6.patch", when="@0.17.0")
 
+    def url_for_version(self, version):
+        url = "https://files.pythonhosted.org/packages/source/C/Cartopy/{}-{}.tar.gz"
+        if version >= Version("0.24"):
+            name = "cartopy"
+        else:
+            name = "Cartopy"
+        return url.format(name, version)
+
     def setup_build_environment(self, env):
         # Needed for `spack install --test=root py-cartopy`
         library_dirs = []
diff --git a/var/spack/repos/builtin/packages/py-owslib/package.py b/var/spack/repos/builtin/packages/py-owslib/package.py
index 47a9c79065..9cd6265bbe 100644
--- a/var/spack/repos/builtin/packages/py-owslib/package.py
+++ b/var/spack/repos/builtin/packages/py-owslib/package.py
@@ -16,6 +16,7 @@ class PyOwslib(PythonPackage):
 
     license("BSD-3-Clause")
 
+    version("0.31.0", sha256="2ed6540087445cc57d905138a590b6ae58624ec7661b5c1682ed4e3303bcd150")
     version("0.25.0", sha256="20d79bce0be10277caa36f3134826bd0065325df0301a55b2c8b1c338d8d8f0a")
     version("0.17.1", sha256="b2e7fd694d3cffcee79317bad492d60c0aa887aea6916517c051c3247b33b5a5")
     version("0.16.0", sha256="ec95a5e93c145a5d84b0074b9ea27570943486552a669151140debf08a100554")
@@ -23,9 +24,10 @@ class PyOwslib(PythonPackage):
     depends_on("python@3.6:", when="@0.19.2:", type=("build", "run"))
     depends_on("python@3.5:", when="@0.19.1:", type=("build", "run"))
     depends_on("py-setuptools", type="build")
+    depends_on("py-lxml", when="@0.31:", type=("build", "run"))
     depends_on("py-python-dateutil@1.5:", type=("build", "run"))
     depends_on("py-pytz", type=("build", "run"))
-    depends_on("py-requests@1:", type=("build", "run"))
-    depends_on("py-pyproj", type=("build", "run"))
-    depends_on("py-pyproj@2:", when="@0.19.2:", type=("build", "run"))
     depends_on("py-pyyaml", when="@0.19.2:", type=("build", "run"))
+    depends_on("py-requests@1:", type=("build", "run"))
+    depends_on("py-pyproj@2:", when="@0.19.2:0.25", type=("build", "run"))
+    depends_on("py-pyproj", when="@:0.25", type=("build", "run"))