From 9ed1c76486691df50a3c4d27ecb5eda969fb4cfa Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 9 May 2022 05:44:33 -0500 Subject: py-cartopy: add new versions (#30554) --- .../repos/builtin/packages/py-cartopy/package.py | 105 +++++++++++++++------ .../repos/builtin/packages/py-owslib/package.py | 16 +++- 2 files changed, 87 insertions(+), 34 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-cartopy/package.py b/var/spack/repos/builtin/packages/py-cartopy/package.py index c075ce54ab..a8ce436f76 100644 --- a/var/spack/repos/builtin/packages/py-cartopy/package.py +++ b/var/spack/repos/builtin/packages/py-cartopy/package.py @@ -10,45 +10,80 @@ class PyCartopy(PythonPackage): """Cartopy - a cartographic python library with matplotlib support.""" homepage = "https://scitools.org.uk/cartopy/docs/latest/" - url = "https://github.com/SciTools/cartopy/archive/v0.18.0.tar.gz" + pypi = "Cartopy/Cartopy-0.20.2.tar.gz" maintainers = ['adamjstewart'] - # Tests require extra dependencies, skip them in 'import_modules' - import_modules = [ - 'cartopy', 'cartopy.sphinxext', 'cartopy.io', 'cartopy.geodesic', - 'cartopy.examples', 'cartopy.mpl', 'cartopy.feature' - ] + version('0.20.2', sha256='4d08c198ecaa50a6a6b109d0f14c070e813defc046a83ac5d7ab494f85599e35') + version('0.20.1', sha256='91f87b130e2574547a20cd634498df97d797abd12dcfd0235bc0cdbcec8b05e3') + version('0.20.0', sha256='eae58aff26806e63cf115b2bce9477cedc4aa9f578c5e477b2c25cfa404f2b7a') + version('0.19.0.post1', sha256='4b8b4773a98ed7009fe17d9b6ec87ac3ac62b7d14634d7768c190eadc647d576') + version('0.18.0', sha256='7ffa317e8f8011e0d965a3ef1179e57a049f77019867ed677d49dcc5c0744434') + version('0.17.0', sha256='424bd9e9ddef6e48cbdee694ce589ec431be8591f15b6cb93cb2b333a29b2c61') + version('0.16.0', sha256='f23dffa101f43dd91e866a49ebb5f5048be2a24ab8a921a5c07edabde746d9a4') - version('0.18.0', sha256='493ced4698361ffabec1a213d2b711dc836117242c304f3b93f5406182fd8bc2') - version('0.17.0', sha256='137642e63952404ec0841fa0333ad14c58fbbf19cca2a5ac6a38498c4b4998fb') - version('0.16.0', sha256='cadf62434492c965220b37f0548bc58180466ad6894a1db57dbc51cd43467e5c') - - variant('epsg', default=False, description='Add support for epsg.io') + variant('epsg', default=False, when='@:0.19', description='Add support for epsg.io') variant('ows', default=False, description='Add support for Open Geospatial Consortium (OGC) web service') variant('plotting', default=False, description='Add plotting functionality') - # https://scitools.org.uk/cartopy/docs/latest/installing.html#installing + # setup.py depends_on('python@2.7:2.8,3.5:', type=('build', 'run')) + depends_on('python@3.5:', when='@0.19:', type=('build', 'run')) + depends_on('python@3.7:', when='@0.20:', type=('build', 'run')) + depends_on('geos@3.3.3:') + depends_on('geos@3.7.2:', when='@0.20:') + depends_on('proj@4.9:5', when='@:0.16') + depends_on('proj@4.9:7', when='@0.17:0.19') + depends_on('proj@8:', when='@0.20:') + + # pyproject.toml depends_on('py-setuptools@0.7.2:', type='build') - depends_on('py-cython@0.28:', type='build') - depends_on('py-numpy@1.10.0:', type=('build', 'run')) + depends_on('py-setuptools@40.6:', when='@0.19:', type='build') + depends_on('py-cython', type='build') + depends_on('py-cython@0.15.1:', when='@0.17:', type='build') + depends_on('py-cython@0.28:', when='@0.18:', type='build') + depends_on('py-cython@0.29.2:', when='@0.19:', type='build') + depends_on('py-cython@0.29.13:', when='@0.20:', type='build') + depends_on('py-setuptools-scm', when='@0.19:', type='build') + depends_on('py-setuptools-scm-git-archive', when='@0.19:', type='build') + + # requirements/default.txt + depends_on('py-numpy@1.6:', type=('build', 'run')) + depends_on('py-numpy@1.10:', when='@0.17:', type=('build', 'run')) + depends_on('py-numpy@1.13.3:', when='@0.19:', type=('build', 'run')) + depends_on('py-numpy@1.18:', when='@0.20:', type=('build', 'run')) + depends_on('py-matplotlib@3.1:', when='@0.20:', type=('build', 'run')) depends_on('py-shapely@1.5.6:', type=('build', 'run')) - depends_on('py-pyshp@1.1.4:', type=('build', 'run')) - depends_on('py-six@1.3.0:', type=('build', 'run')) - depends_on('py-futures', when='^python@:2', type=('build', 'run')) - depends_on('geos@3.3.3:') - depends_on('proj@4.9:5', when='@:0.16.0') - depends_on('proj@4.9:7', when='@0.17.0:') - - # Optional dependecies - depends_on('py-pyepsg@0.4.0:', type=('build', 'run'), when='+epsg') - depends_on('py-owslib@0.8.11:', type=('build', 'run'), when='+ows') - depends_on('pil@1.7.8:', type=('build', 'run'), when='+ows') - 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('pil@1.7.8:', type=('build', 'run'), when='+plotting') - depends_on('py-scipy@0.10:', type=('build', 'run'), when='+plotting') + depends_on('py-shapely@1.6.4:', when='@0.20:', type=('build', 'run')) + depends_on('py-pyshp@1.1.4:', type=('build', 'run')) + depends_on('py-pyshp@2:', when='@0.19:', type=('build', 'run')) + depends_on('py-pyshp@2.1:', when='@0.20:', type=('build', 'run')) + depends_on('py-pyproj@3:', when='@0.20:', type=('build', 'run')) + depends_on('py-six@1.3:', when='@:0.18', type=('build', 'run')) + depends_on('py-futures', when='@0.18 ^python@2.7', type=('build', 'run')) + + # requirements/epsg.txt + with when('+epsg'): + depends_on('py-pyepsg@0.2:', type='run') + depends_on('py-pyepsg@0.4:', when='@0.18:', type='run') + + # requirements/ows.txt + with when('+ows'): + depends_on('py-owslib@0.8.11:', type='run') + depends_on('py-owslib@0.18:', when='@0.20:', type='run') + depends_on('pil@1.7.8:', type='run') + depends_on('pil@6.1:', when='@0.20:', type='run') + + # requirements/plotting.txt + with when('+plotting'): + depends_on('py-matplotlib@1.3:', when='@0.16', type='run') + depends_on('py-matplotlib@1.5.1:', when='@0.17:0.19', type='run') + depends_on('gdal@1.10:+python', type='run') + depends_on('gdal@2.3.2:+python', when='@0.20:', type='run') + depends_on('pil@1.7.8:', type='run') + depends_on('pil@6.1:', when='@0.20:', type='run') + depends_on('py-scipy@0.10:', type='run') + depends_on('py-scipy@1.3.1:', when='@0.20:', type='run') patch('proj6.patch', when='@0.17.0') @@ -73,3 +108,15 @@ class PyCartopy(PythonPackage): # Needed for `spack test run py-foo` where `py-foo` depends on `py-cartopy` def setup_dependent_run_environment(self, env, dependent_spec): self.setup_build_environment(env) + + @property + def import_modules(self): + modules = super(__class__, self).import_modules + + # Tests require extra dependencies, skip them in 'import_modules' + ignored_imports = [ + "cartopy.tests", + ] + + return [i for i in modules + if not any(map(i.startswith, ignored_imports))] diff --git a/var/spack/repos/builtin/packages/py-owslib/package.py b/var/spack/repos/builtin/packages/py-owslib/package.py index 17e4c55a53..f96de159ec 100644 --- a/var/spack/repos/builtin/packages/py-owslib/package.py +++ b/var/spack/repos/builtin/packages/py-owslib/package.py @@ -14,11 +14,17 @@ class PyOwslib(PythonPackage): homepage = "http://http://geopython.github.io/OWSLib/#installation" pypi = "OWSLib/OWSLib-0.16.0.tar.gz" + version('0.25.0', sha256='20d79bce0be10277caa36f3134826bd0065325df0301a55b2c8b1c338d8d8f0a') version('0.17.1', sha256='b2e7fd694d3cffcee79317bad492d60c0aa887aea6916517c051c3247b33b5a5') version('0.16.0', sha256='ec95a5e93c145a5d84b0074b9ea27570943486552a669151140debf08a100554') - depends_on('py-setuptools', type='build') - depends_on('py-python-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-pyproj', type=('build', 'run')) + depends_on('python@3.6:', when='@0.19.2:', type=('build', 'run')) + depends_on('python@3.5:', when='@0.19.1:', type=('build', 'run')) + depends_on('py-setuptools', type='build') + depends_on('py-python-dateutil@1.5:', type=('build', 'run')) + depends_on('py-pytz', type=('build', 'run')) + depends_on('py-requests@1:', type=('build', 'run')) + depends_on('py-pyproj', type=('build', 'run')) + depends_on('py-pyproj@2:', when='@0.19.2:', type=('build', 'run')) + depends_on('py-pyyaml', when='@0.19.2:', type=('build', 'run')) + depends_on('py-dataclasses', when='@0.25: ^python@:3.6', type=('build', 'run')) -- cgit v1.2.3-60-g2f50