From 0a666af3267ed958cceef70726ed685c1f253794 Mon Sep 17 00:00:00 2001
From: Glenn Johnson <glenn-johnson@uiowa.edu>
Date: Mon, 13 Jan 2020 20:34:13 -0600
Subject: [PATCH] Remove overlapping depends_on statement for py-basemap
(#14475)
This PR resolves an overlapping dependency specification for py-basemap.
---
var/spack/repos/builtin/packages/py-basemap/package.py | 3 +--
1 file changed, 1 insertion(+), 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')
--
GitLab