diff options
| author | Elizabeth Fischer <eafischer2@alaska.edu> | 2020-08-25 00:24:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 23:24:56 -0500 |
| commit | c13bc308db35928860a2d03a17f2fd432459d9ec (patch) | |
| tree | bd694f8f32f6c38c8f8b84ff9421efbc1661df0b | |
| parent | 5e1909c00a687684cb51516d124d43eedcc8f1d3 (diff) | |
| download | spack-c13bc308db35928860a2d03a17f2fd432459d9ec.tar.gz spack-c13bc308db35928860a2d03a17f2fd432459d9ec.tar.bz2 spack-c13bc308db35928860a2d03a17f2fd432459d9ec.tar.xz spack-c13bc308db35928860a2d03a17f2fd432459d9ec.zip | |
py-basemap: Update for proj@6 (#16183)
* py-basemap
* Updated versions + URL attribute
* Update var/spack/repos/builtin/packages/py-basemap/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Update var/spack/repos/builtin/packages/py-basemap/package.py
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* Removed unnecssary comment
* flake8
Co-authored-by: Elizabeth Fischer <elizabeth.fischer@alaska.edu>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/py-basemap/package.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-basemap/package.py b/var/spack/repos/builtin/packages/py-basemap/package.py index cc062ef347..95dda66b30 100644 --- a/var/spack/repos/builtin/packages/py-basemap/package.py +++ b/var/spack/repos/builtin/packages/py-basemap/package.py @@ -11,8 +11,10 @@ class PyBasemap(PythonPackage): """The matplotlib basemap toolkit is a library for plotting 2D data on maps in Python.""" + url = 'https://github.com/matplotlib/basemap/archive/v1.2.0rel.tar.gz' homepage = "http://matplotlib.org/basemap/" + version('1.2.1', sha256='3fb30424f18cd4ffd505e30fd9c810ae81b999bb92f950c76553e1abc081faa7') version('1.2.0', sha256='bd5bf305918a2eb675939873b735238f9e3dfe6b5c290e37c41e5b082ff3639a') version('1.0.7', sha256='e07ec2e0d63b24c9aed25a09fe8aff2598f82a85da8db74190bac81cbf104531') @@ -20,10 +22,15 @@ class PyBasemap(PythonPackage): # to make mpl_toolkits a namespace package that can span multiple # directories (i.e., matplotlib and basemap) 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')) - depends_on('py-pyshp', type=('build', 'run')) + depends_on('py-numpy@1.2.1:', type=('build', 'run')) + depends_on('py-matplotlib@1.0.0:3.0.0,3.0.2:', type=('build', 'run')) + depends_on('py-pyproj@1.9.3:1.99', type=('build', 'run'), when='@:1.2.0') + # 1.2.1 is PROJ6 compatible + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939022 + depends_on('py-pyproj@1.9.3:', type=('build', 'run'), when='@1.2.1:') + + depends_on('py-pyshp@1.2.0:', type=('build', 'run')) + depends_on('py-six', type=('build', 'run')) depends_on('pil', type=('build', 'run')) depends_on('geos') |