summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGlenn Johnson <glenn-johnson@uiowa.edu>2020-01-13 20:34:13 -0600
committerAdam J. Stewart <ajstewart426@gmail.com>2020-01-13 20:34:13 -0600
commit0a666af3267ed958cceef70726ed685c1f253794 (patch)
treee97a495b2f9d7d975624bb83393df73dab09d7e3 /var
parent487731e2071c85d88f7edec0d88e21be72421f85 (diff)
downloadspack-0a666af3267ed958cceef70726ed685c1f253794.tar.gz
spack-0a666af3267ed958cceef70726ed685c1f253794.tar.bz2
spack-0a666af3267ed958cceef70726ed685c1f253794.tar.xz
spack-0a666af3267ed958cceef70726ed685c1f253794.zip
Remove overlapping depends_on statement for py-basemap (#14475)
This PR resolves an overlapping dependency specification for py-basemap.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/py-basemap/package.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py
index 94820c8491..cc062ef347 100644
--- a/var/spack/repos/builtin/packages/py-basemap/package.py
+++ b/var/spack/repos/builtin/packages/py-basemap/package.py
@@ -22,8 +22,7 @@ class PyBasemap(PythonPackage):
depends_on('py-setuptools', type=('build', 'run'))
depends_on('py-numpy', type=('build', 'run'))
depends_on('py-matplotlib', type=('build', 'run'))
- depends_on('py-pyproj@:1.99', type=('build', 'run'), when='@:1.2.0')
- depends_on('py-pyproj', type=('build', 'run'))
+ depends_on('py-pyproj@:1.99', type=('build', 'run'))
depends_on('py-pyshp', type=('build', 'run'))
depends_on('pil', type=('build', 'run'))
depends_on('geos')