From 8a78c9c6bcff6de7c9b23eba8e1d3747c19d3cbc Mon Sep 17 00:00:00 2001
From: Neil Flood <neilflood@fastmail.fm>
Date: Wed, 28 Nov 2018 08:31:30 +1000
Subject: [PATCH] Rename py-proj to py-pyproj, consistent with Spack's current
 naming conventions (#9962)

---
 var/spack/repos/builtin/packages/py-geopandas/package.py      | 2 +-
 var/spack/repos/builtin/packages/py-owslib/package.py         | 2 +-
 .../repos/builtin/packages/{py-proj => py-pyproj}/package.py  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename var/spack/repos/builtin/packages/{py-proj => py-pyproj}/package.py (92%)

diff --git a/var/spack/repos/builtin/packages/py-geopandas/package.py b/var/spack/repos/builtin/packages/py-geopandas/package.py
index 7078f67de56..a7c64cf4a39 100644
--- a/var/spack/repos/builtin/packages/py-geopandas/package.py
+++ b/var/spack/repos/builtin/packages/py-geopandas/package.py
@@ -25,6 +25,6 @@ class PyGeopandas(PythonPackage):
     depends_on('py-descartes', type=('build', 'run'), when='+plotting')
     depends_on('py-matplotlib', type=('build', 'run'), when='+plotting')
     depends_on('py-fiona', type=('build', 'run'))
-    depends_on('py-proj', type=('build', 'run'))
+    depends_on('py-pyproj', type=('build', 'run'))
     depends_on('py-shapely', type=('build', 'run'))
     depends_on('py-pandas', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-owslib/package.py b/var/spack/repos/builtin/packages/py-owslib/package.py
index dfb2372d8f0..ca8d7a65de5 100644
--- a/var/spack/repos/builtin/packages/py-owslib/package.py
+++ b/var/spack/repos/builtin/packages/py-owslib/package.py
@@ -20,4 +20,4 @@ class PyOwslib(PythonPackage):
     depends_on('py-dateutil@1.5:',  type=('build', 'run'))
     depends_on('py-pytz',           type=('build', 'run'))
     depends_on('py-requests@1.0:',  type=('build', 'run'))
-    depends_on('py-proj',           type=('build', 'run'))
+    depends_on('py-pyproj',           type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-proj/package.py b/var/spack/repos/builtin/packages/py-pyproj/package.py
similarity index 92%
rename from var/spack/repos/builtin/packages/py-proj/package.py
rename to var/spack/repos/builtin/packages/py-pyproj/package.py
index 554b4047427..754381a4a43 100644
--- a/var/spack/repos/builtin/packages/py-proj/package.py
+++ b/var/spack/repos/builtin/packages/py-pyproj/package.py
@@ -6,7 +6,7 @@
 from spack import *
 
 
-class PyProj(PythonPackage):
+class PyPyproj(PythonPackage):
     """Python interface to the PROJ.4 Library."""
 
     homepage = "http://jswhit.github.io/pyproj/"
@@ -21,7 +21,7 @@ class PyProj(PythonPackage):
     depends_on('py-cython', type='build')
     depends_on('py-setuptools', type='build')
 
-    # NOTE: py-proj does NOT depends_on('proj').
+    # NOTE: py-pyproj does NOT depends_on('proj').
     # The py-proj git repo actually includes the correct version of PROJ.4,
     # which is built internally as part of the py-proj build.
     # Adding depends_on('proj') will cause mysterious build errors.