py-pyproj: add v3.5.0 (#36504)

* py-pyproj: add v3.5.0
* PROJ: add v9, fix datum grid installation
* [@spackbot] updating style on behalf of adamjstewart

---------

Co-authored-by: adamjstewart <adamjstewart@users.noreply.github.com>

2 files changed, 36 insertions, 29 deletions

diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py
index f2ce92a72d..675e69da37 100644
--- a/var/spack/repos/builtin/packages/proj/package.py
+++ b/var/spack/repos/builtin/packages/proj/package.py
@@ -21,6 +21,12 @@ class Proj(CMakePackage, AutotoolsPackage):
     # Version 6 removes projects.h, while version 7 removes proj_api.h.
     # Many packages that depend on proj do not yet support the newer API.
     # See https://github.com/OSGeo/PROJ/wiki/proj.h-adoption-status
+
+    version("9.2.0", sha256="dea816f5aa732ae6b2ee3977b9bdb28b1d848cf56a1aad8faf6708b89f0ed50e")
+    version("9.1.1", sha256="003cd4010e52bb5eb8f7de1c143753aa830c8902b6ed01209f294846e40e6d39")
+    version("9.1.0", sha256="81b2239b94cad0886222cde4f53cb49d34905aad2a1317244a0c30a553db2315")
+    version("9.0.1", sha256="737eaacbe7906d0d6ff43f0d9ebedc5c734cccc9e6b8d7beefdec3ab22d9a6a3")
+    version("9.0.0", sha256="0620aa01b812de00b54d6c23e7c5cc843ae2cd129b24fabe411800302172b989")
     version("8.2.1", sha256="76ed3d0c3a348a6693dfae535e5658bbfd47f71cb7ff7eb96d9f12f7e068b1cf")
     version("8.2.0", sha256="de93df9a4aa88d09459ead791f2dbc874b897bf67a5bbb3e4b68de7b1bdef13c")
     version("8.1.1", sha256="82f1345e5fa530c407cb1fc0752e83f8d08d2b98772941bbdc7820241f7fada2")
@@ -53,24 +59,10 @@ class Proj(CMakePackage, AutotoolsPackage):
     # https://github.com/OSGeo/PROJ-data
     resource(
         name="proj-data",
-        url="https://download.osgeo.org/proj/proj-data-1.4.tar.gz",
-        sha256="76960d34d635aa127058ce654d89ea0eff91e2e4f2036482e677af5a88669b08",
-        placement="nad",
-        when="@7.2.1:",
-    )
-    resource(
-        name="proj-data",
-        url="https://download.osgeo.org/proj/proj-data-1.3.tar.gz",
-        sha256="0faa3e5ca6d816c907868c1ab2523668ccad27c6c4af9c7b00df9e4c3eb84398",
-        placement="nad",
-        when="@7.2.0",
-    )
-    resource(
-        name="proj-data",
-        url="https://download.osgeo.org/proj/proj-data-1.1.tar.gz",
-        sha256="df7c57e60f9e1d5bcc724f1def71d2a7cd33bd83c28f4b4bb71dbb2d8849c84a",
-        placement="nad",
-        when="@7:7.1",
+        url="https://download.osgeo.org/proj/proj-data-1.13.tar.gz",
+        sha256="f1e5e42ba15426d01d1970be727af77ac9b88c472215497a5a433d0a16dd105b",
+        placement=join_path("share", "proj"),
+        when="@7:",
     )
 
     # https://github.com/OSGeo/PROJ#distribution-files-and-format
@@ -79,19 +71,27 @@ class Proj(CMakePackage, AutotoolsPackage):
         name="proj-datumgrid",
         url="https://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz",
         sha256="3ff6618a0acc9f0b9b4f6a62e7ff0f7bf538fb4f74de47ad04da1317408fcc15",
-        placement="nad",
+        placement=join_path("share", "proj"),
         when="@:6",
     )
 
     # https://proj.org/install.html#build-requirements
-    depends_on("googletest", when="@6:")
+    with when("build_system=cmake"):
+        depends_on("cmake@3.9:", when="@6:", type="build")
+        depends_on("cmake@3.5:", when="@5", type="build")
+        depends_on("cmake@2.6:", when="@:4", type="build")
+
+    with when("build_system=autotools"):
+        depends_on("pkgconfig@0.9:", when="@6:", type="build")
+
     depends_on("sqlite@3.11:", when="@6:")
-    depends_on("libtiff@4.0:", when="@7:+tiff")
-    depends_on("curl@7.29.0:", when="@7:+curl")
-    depends_on("pkgconfig@0.9.0:", type="build", when="@6: build_system=autotools")
-    depends_on("cmake@2.6.0:", type="build", when="build_system=cmake")
+    depends_on("libtiff@4:", when="@7:+tiff")
+    depends_on("curl@7.29:", when="@7:+curl")
+    depends_on("googletest", when="@6:", type="test")
 
-    build_system("autotools", conditional("cmake", when="@5.0.0:"), default="cmake")
+    build_system(
+        conditional("autotools", when="@:8"), conditional("cmake", when="@5:"), default="cmake"
+    )
 
     def setup_run_environment(self, env):
         # PROJ_LIB doesn't need to be set. However, it may be set by conda.
@@ -105,15 +105,19 @@ class Proj(CMakePackage, AutotoolsPackage):
         self.setup_run_environment(env)
 
 
-class Setup:
+class BaseBuilder:
     def setup_dependent_build_environment(self, env, dependent_spec):
         self.pkg.setup_run_environment(env)
 
     def setup_build_environment(self, env):
         env.set("PROJ_LIB", join_path(self.pkg.stage.source_path, "nad"))
 
+    @run_after("install")
+    def install_datum_grids(self):
+        install_tree(join_path("share", "proj"), self.prefix.share.proj)
+
 
-class CMakeBuilder(cmake.CMakeBuilder, Setup):
+class CMakeBuilder(cmake.CMakeBuilder, BaseBuilder):
     def cmake_args(self):
         args = [
             self.define_from_variant("ENABLE_TIFF", "tiff"),
@@ -124,7 +128,7 @@ class CMakeBuilder(cmake.CMakeBuilder, Setup):
         return args
 
 
-class AutotoolsBuilder(autotools.AutotoolsBuilder, Setup):
+class AutotoolsBuilder(autotools.AutotoolsBuilder, BaseBuilder):
     def configure_args(self):
         args = []
 
diff --git a/var/spack/repos/builtin/packages/py-pyproj/package.py b/var/spack/repos/builtin/packages/py-pyproj/package.py
index b343f4963c..055e6c7c8f 100644
--- a/var/spack/repos/builtin/packages/py-pyproj/package.py
+++ b/var/spack/repos/builtin/packages/py-pyproj/package.py
@@ -16,6 +16,7 @@ class PyPyproj(PythonPackage):
 
     maintainers("citibeth", "adamjstewart")
 
+    version("3.5.0", sha256="9859d1591c1863414d875ae0759e72c2cffc01ab989dc64137fbac572cc81bf6")
     version("3.4.1", sha256="261eb29b1d55b1eb7f336127344d9b31284d950a9446d1e0d1c2411f7dd8e3ac")
     version("3.4.0", sha256="a708445927ace9857f52c3ba67d2915da7b41a8fdcd9b8f99a4c9ed60a75eb33")
     version("3.3.1", sha256="b3d8e14d91cc95fb3dbc03a9d0588ac58326803eefa5bbb0978d109de3304fbe")
@@ -39,8 +40,10 @@ class PyPyproj(PythonPackage):
     depends_on("python@3.8:", when="@3.3:", type=("build", "link", "run"))
     depends_on("py-certifi", when="@3:", type=("build", "run"))
 
+    # In setup.py (PROJ_MIN_VERSION)
     # https://pyproj4.github.io/pyproj/stable/installation.html#installing-from-source
-    depends_on("proj@8.2:", when="@3.4:")
+    depends_on("proj@9:", when="@3.5:")
+    depends_on("proj@8.2:", when="@3.4")
     depends_on("proj@8.0:9.1", when="@3.3")
     depends_on("proj@7.2:9.1", when="@3.0.1:3.2")
     depends_on("proj@7.2", when="@3.0.0")