From bb4ccdfa91f6ea8ca80d14661e81fbff22b06ffd Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Fri, 12 Mar 2021 00:39:25 +0000 Subject: Add newest versions of py-h5py (#22245) * Add newest versions of py-h5py * Update dependencies for py-h5py --- var/spack/repos/builtin/packages/py-h5py/package.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index e2482cb65c..36a1d5e952 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -11,10 +11,12 @@ class PyH5py(PythonPackage): HDF5 library from Python.""" homepage = "http://www.h5py.org/" - pypi = "h5py/h5py-3.1.0.tar.gz" + pypi = "h5py/h5py-3.2.1.tar.gz" git = "https://github.com/h5py/h5py.git" version('master', branch='master') + version('3.2.1', sha256='89474be911bfcdb34cbf0d98b8ec48b578c27a89fdb1ae4ee7513f1ef8d9249e') + version('3.2.0', sha256='4271c1a4b7d87aa76fe96d016368beb05a6c389d64882d58036964ce7d2d03c1') version('3.1.0', sha256='1e2516f190652beedcb8c7acfa1c6fa92d99b42331cbef5e5c7ec2d65b0fc3c2') version('3.0.0', sha256='7d3803be1b530c68c2955faba726dc0f591079b68941a0c0269b5384a42ab519') version('2.10.0', sha256='84412798925dc870ffd7107f045d7659e60f5d46d1c70c700375248bf6bf512d') @@ -29,7 +31,8 @@ class PyH5py(PythonPackage): variant('mpi', default=True, description='Build with MPI support') # Python versions - depends_on('python@3.6:', type=('build', 'run'), when='@3.0.0:') + depends_on('python@3.6:', type=('build', 'run'), when='@3.0.0:3.1.99') + depends_on('python@3.7:', type=('build', 'run'), when='@3.2.0:') # Build dependencies depends_on('py-cython@0.23:', type='build', when='@:2.99') @@ -39,8 +42,9 @@ class PyH5py(PythonPackage): depends_on('py-wheel', type='build', when='@3.0.0:') # Build and runtime dependencies - depends_on('py-cached-property@1.5:', type=('build', 'run')) - depends_on('py-numpy@1.7:', type=('build', 'run')) + depends_on('py-cached-property@1.5:', type=('build', 'run'), when='python@:3.7.999') + depends_on('py-numpy@1.7:', type=('build', 'run'), when='@:3.1.99') + depends_on('py-numpy@1.14.5:', type=('build', 'run'), when='@3.2.0:') depends_on('py-six', type=('build', 'run'), when='@:2.99') # Link dependencies @@ -51,7 +55,8 @@ class PyH5py(PythonPackage): depends_on('hdf5+mpi', when='+mpi') depends_on('hdf5~mpi', when='~mpi') depends_on('mpi', when='+mpi') - depends_on('py-mpi4py', when='+mpi', type=('build', 'run')) + depends_on('py-mpi4py', when='@:2.99 +mpi', type=('build', 'run')) + depends_on('py-mpi4py@3.0.0:', when='@3.0.0: +mpi', type=('build', 'run')) phases = ['configure', 'install'] -- cgit v1.2.3-70-g09d2