diff options
| author | iarspider <iarspider@gmail.com> | 2019-11-28 03:01:05 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2019-11-27 20:01:05 -0600 |
| commit | 6d7250f59cf5454c868f4a3fb42e0adb83dffa76 (patch) | |
| tree | ab02dedb3b4cf4c10c6b926ddb97f99c86ce3d71 /var | |
| parent | d7db42e2013fa97e04788a8e6f297c7ea1c0fdb1 (diff) | |
| download | spack-6d7250f59cf5454c868f4a3fb42e0adb83dffa76.tar.gz spack-6d7250f59cf5454c868f4a3fb42e0adb83dffa76.tar.bz2 spack-6d7250f59cf5454c868f4a3fb42e0adb83dffa76.tar.xz spack-6d7250f59cf5454c868f4a3fb42e0adb83dffa76.zip | |
Update cartopy version and fix recipe (#13898)
* Update cartopy version and fix recipe
Cartopy 0.17.0 works fine with proj 6
* Update cartopy version and fix recipe
Cartopy 0.17.0 works fine with proj 6
* Set ACCEPT_USE_OF_DEPRECATED_PROJ_API_H flag when building extension
* Add variants to py-cartopy recipe as suggested
* Fix proj dependency
* Split dependency
* Fix PEP-8; remove extra dependency
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-cartopy/package.py | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py index b00c71645c..4eac0a97e9 100644 --- a/var/spack/repos/builtin/packages/py-cartopy/package.py +++ b/var/spack/repos/builtin/packages/py-cartopy/package.py @@ -12,6 +12,7 @@ class PyCartopy(PythonPackage): homepage = "http://scitools.org.uk/cartopy/" url = "https://github.com/SciTools/cartopy/archive/v0.16.0.tar.gz" + version('0.17.0', sha256='137642e63952404ec0841fa0333ad14c58fbbf19cca2a5ac6a38498c4b4998fb') version('0.16.0', sha256='cadf62434492c965220b37f0548bc58180466ad6894a1db57dbc51cd43467e5c') depends_on('py-setuptools@0.7.2:', type='build') @@ -21,17 +22,24 @@ class PyCartopy(PythonPackage): depends_on('py-pyshp@1.1.4:', type=('build', 'run')) depends_on('py-six@1.3.0:', type=('build', 'run')) depends_on('geos@3.3.3:') - depends_on('proj@4.9.0:5') + depends_on('proj@4.9.0:5', when='@0.16.0') + depends_on('proj@4.9:', when='@0.17.0') + + variant('epsg', default=True, description='Add support for epsg.io') + variant('ows', default=True, description='Add support for Open Geospatial Consortium (OGC) web service') + variant('plotting', default=True, description='Add plotting functionality') # optional dependecies - depends_on('py-matplotlib@1.5.1:', type=('build', 'run')) - depends_on('gdal@1.10.0:+python', type=('build', 'run')) - depends_on('py-pillow@1.7.8:', type=('build', 'run')) - depends_on('py-pyepsg@0.2.0:', type=('build', 'run')) - depends_on('py-scipy@0.10:', type=('build', 'run')) - depends_on('py-owslib@0.8.11:', type=('build', 'run')) + depends_on('py-matplotlib@1.5.1:', type=('build', 'run'), when='+plotting') + depends_on('gdal@1.10.0:+python', type=('build', 'run'), when='+plotting') + depends_on('py-pillow@1.7.8:', type=('build', 'run'), when='+ows') + depends_on('py-pillow@1.7.8:', type=('build', 'run'), when='+plotting') + depends_on('py-pyepsg@0.2.0:', type=('build', 'run'), when='+epsg') + depends_on('py-scipy@0.10:', type=('build', 'run'), when='+plotting') + depends_on('py-owslib@0.8.11:', type=('build', 'run'), when='+ows') # testing dependencies + depends_on('py-filelock', type='test') depends_on('py-mock@1.0.1', type='test') depends_on('py-pytest@3.0.0:', type='test') @@ -41,4 +49,8 @@ class PyCartopy(PythonPackage): args = ['-I{0}'.format(spec['proj'].prefix.include), '-L{0}'.format(spec['proj'].prefix.lib) ] + + if spec.satisfies('@0.17.0 ^proj@6'): + args.append('-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H') + return args |