From e62676b2453468d22463a18d69f0911e0be02d14 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 29 Dec 2020 01:40:23 -0600 Subject: [PATCH] Fix deptypes for some geospatial Python packages (#20593) --- var/spack/repos/builtin/packages/py-fiona/package.py | 10 +++++----- .../repos/builtin/packages/py-rasterio/package.py | 2 +- var/spack/repos/builtin/packages/py-shapely/package.py | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-fiona/package.py b/var/spack/repos/builtin/packages/py-fiona/package.py index 54d515aab2..b259fb27bc 100644 --- a/var/spack/repos/builtin/packages/py-fiona/package.py +++ b/var/spack/repos/builtin/packages/py-fiona/package.py @@ -20,12 +20,12 @@ class PyFiona(PythonPackage): version('1.8.6', sha256='fa31dfe8855b9cd0b128b47a4df558f1b8eda90d2181bff1dd9854e5556efb3e') version('1.7.12', sha256='8b54eb8422d7c502bb7776b184018186bede1a489cf438a7a47f992ade6a0e51') - depends_on('python@3.6:', type=('build', 'run'), when='@1.9:') - depends_on('python@2.6:', type=('build', 'run')) - depends_on('gdal@1.11:', type=('build', 'run'), when='@1.9:') - depends_on('gdal@1.8:', type=('build', 'run')) + depends_on('python@3.6:', type=('build', 'link', 'run'), when='@1.9:') + depends_on('python@2.6:', type=('build', 'link', 'run')) + depends_on('gdal@1.11:', type=('build', 'link', 'run'), when='@1.9:') + depends_on('gdal@1.8:', type=('build', 'link', 'run')) - depends_on('py-setuptools', type='build') + depends_on('py-setuptools', type=('build', 'run')) depends_on('py-cython', type='build', when='@master') depends_on('py-attrs@17:', type=('build', 'run')) depends_on('py-certifi', type=('build', 'run'), when='@1.8.18') diff --git a/var/spack/repos/builtin/packages/py-rasterio/package.py b/var/spack/repos/builtin/packages/py-rasterio/package.py index 5f248a1734..f8b3c8d80d 100644 --- a/var/spack/repos/builtin/packages/py-rasterio/package.py +++ b/var/spack/repos/builtin/packages/py-rasterio/package.py @@ -29,7 +29,7 @@ class PyRasterio(PythonPackage): depends_on('python@3.5:', type=('build', 'link', 'run'), when='@1.2:') depends_on('python@2.7:2.8,3.5:3.8', type=('build', 'link', 'run'), when='@1.1.0:1.1.999') depends_on('python@2.7:2.8,3.5:3.7', type=('build', 'link', 'run'), when='@:1.0') - depends_on('py-setuptools', type='build') + depends_on('py-setuptools', type=('build', 'run')) depends_on('py-cython', type='build', when='@master') depends_on('py-affine', type=('build', 'run')) depends_on('py-attrs', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-shapely/package.py b/var/spack/repos/builtin/packages/py-shapely/package.py index 345d28b042..b9130e78d5 100644 --- a/var/spack/repos/builtin/packages/py-shapely/package.py +++ b/var/spack/repos/builtin/packages/py-shapely/package.py @@ -22,12 +22,12 @@ class PyShapely(PythonPackage): version('1.7.0', sha256='e21a9fe1a416463ff11ae037766fe410526c95700b9e545372475d2361cc951e') version('1.6.4', sha256='b10bc4199cfefcf1c0e5d932eac89369550320ca4bdf40559328d85f1ca4f655') - depends_on('python@3.5:', when='@1.8:', type=('build', 'run')) - depends_on('python@2.7:2.8,3.4:', when='@1.7:', type=('build', 'run')) - depends_on('python@2.6:', type=('build', 'run')) + depends_on('python@3.5:', when='@1.8:', type=('build', 'link', 'run')) + depends_on('python@2.7:2.8,3.4:', when='@1.7:', type=('build', 'link', 'run')) + depends_on('python@2.6:', type=('build', 'link', 'run')) depends_on('py-setuptools', type='build') depends_on('py-cython', type='build') - depends_on('py-numpy', type=('build', 'run')) + depends_on('py-numpy', type=('build', 'link', 'run')) depends_on('geos') depends_on('geos@3.3:', when='@1.3:') depends_on('py-pytest', type='test')