From 8a78c9c6bcff6de7c9b23eba8e1d3747c19d3cbc Mon Sep 17 00:00:00 2001 From: Neil Flood Date: Wed, 28 Nov 2018 08:31:30 +1000 Subject: Rename py-proj to py-pyproj, consistent with Spack's current naming conventions (#9962) --- .../repos/builtin/packages/py-geopandas/package.py | 2 +- .../repos/builtin/packages/py-owslib/package.py | 2 +- .../repos/builtin/packages/py-proj/package.py | 27 ---------------------- .../repos/builtin/packages/py-pyproj/package.py | 27 ++++++++++++++++++++++ 4 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 var/spack/repos/builtin/packages/py-proj/package.py create mode 100644 var/spack/repos/builtin/packages/py-pyproj/package.py diff --git a/var/spack/repos/builtin/packages/py-geopandas/package.py b/var/spack/repos/builtin/packages/py-geopandas/package.py index 7078f67de5..a7c64cf4a3 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 dfb2372d8f..ca8d7a65de 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-proj/package.py deleted file mode 100644 index 554b404742..0000000000 --- a/var/spack/repos/builtin/packages/py-proj/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack import * - - -class PyProj(PythonPackage): - """Python interface to the PROJ.4 Library.""" - - homepage = "http://jswhit.github.io/pyproj/" - url = "https://github.com/jswhit/pyproj/tarball/v1.9.5.1rel" - git = "https://www.github.com/jswhit/pyproj.git" - - # This is not a tagged release of pyproj. - # The changes in this "version" fix some bugs, especially with Python3 use. - version('1.9.5.1.1', commit='0be612cc9f972e38b50a90c946a9b353e2ab140f') - version('1.9.5.1', 'a4b80d7170fc82aee363d7f980279835') - - depends_on('py-cython', type='build') - depends_on('py-setuptools', type='build') - - # NOTE: py-proj 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. diff --git a/var/spack/repos/builtin/packages/py-pyproj/package.py b/var/spack/repos/builtin/packages/py-pyproj/package.py new file mode 100644 index 0000000000..754381a4a4 --- /dev/null +++ b/var/spack/repos/builtin/packages/py-pyproj/package.py @@ -0,0 +1,27 @@ +# Copyright 2013-2018 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack import * + + +class PyPyproj(PythonPackage): + """Python interface to the PROJ.4 Library.""" + + homepage = "http://jswhit.github.io/pyproj/" + url = "https://github.com/jswhit/pyproj/tarball/v1.9.5.1rel" + git = "https://www.github.com/jswhit/pyproj.git" + + # This is not a tagged release of pyproj. + # The changes in this "version" fix some bugs, especially with Python3 use. + version('1.9.5.1.1', commit='0be612cc9f972e38b50a90c946a9b353e2ab140f') + version('1.9.5.1', 'a4b80d7170fc82aee363d7f980279835') + + depends_on('py-cython', type='build') + depends_on('py-setuptools', type='build') + + # 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. -- cgit v1.2.3-70-g09d2