diff options
| author | Thomas Kluyver <thomas.kluyver@xfel.eu> | 2021-07-14 12:33:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 07:33:57 -0400 |
| commit | c33ec328fb8015b0bb62bacd6a7caeb181c15c78 (patch) | |
| tree | ffe592d3bdf6c6d7c62965069687b34070b6133f /var | |
| parent | 652f35a39fd9c2b652eb5a0d87dc0ac28380b1ed (diff) | |
| download | spack-c33ec328fb8015b0bb62bacd6a7caeb181c15c78.tar.gz spack-c33ec328fb8015b0bb62bacd6a7caeb181c15c78.tar.bz2 spack-c33ec328fb8015b0bb62bacd6a7caeb181c15c78.tar.xz spack-c33ec328fb8015b0bb62bacd6a7caeb181c15c78.zip | |
Add py-h5py version 3.3.0 (#24781)
* Add py-h5py version 3.3.0
The mpi4py dependency was bumped to 3.0.2 in setup.py. I'm not sure if that's actually required or not, but nothing lower is still tested.
* Use environment variable to stop h5py using setuptools setup_requires feature
* Add myself as a maintainer for py-h5py
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/py-h5py/h5py-3-setuprequires.patch | 21 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-h5py/package.py | 16 |
2 files changed, 9 insertions, 28 deletions
diff --git a/var/spack/repos/builtin/packages/py-h5py/h5py-3-setuprequires.patch b/var/spack/repos/builtin/packages/py-h5py/h5py-3-setuprequires.patch deleted file mode 100644 index c8c6654736..0000000000 --- a/var/spack/repos/builtin/packages/py-h5py/h5py-3-setuprequires.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur h5py-3.1.0/setup.py h5py-3.1.0.patch/setup.py ---- h5py-3.1.0/setup.py 2020-11-06 14:25:11.000000000 +0000 -+++ h5py-3.1.0.patch/setup.py 2021-03-04 20:12:19.913405154 +0000 -@@ -49,14 +49,14 @@ - f"Cython >=0.29; python_version<'3.8'", - f"Cython >=0.29.14; python_version>='3.8'", - ] + [ -- f"numpy =={np_min}; python_version{py_condition}" -+ f"numpy >={np_min}; python_version{py_condition}" - for np_min, py_condition in NUMPY_MIN_VERSIONS - ] - - if setup_configure.mpi_enabled(): - RUN_REQUIRES.append('mpi4py >=3.0.0') -- SETUP_REQUIRES.append("mpi4py ==3.0.0; python_version<'3.8'") -- SETUP_REQUIRES.append("mpi4py ==3.0.3; python_version>='3.8'") -+ SETUP_REQUIRES.append("mpi4py >=3.0.0; python_version<'3.8'") -+ SETUP_REQUIRES.append("mpi4py >=3.0.3; python_version>='3.8'") - - # Set the environment variable H5PY_SETUP_REQUIRES=0 if we need to skip - # setup_requires for any reason. diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index a1351d4797..bab55b7fe1 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -11,11 +11,12 @@ class PyH5py(PythonPackage): HDF5 library from Python.""" homepage = "http://www.h5py.org/" - pypi = "h5py/h5py-3.2.1.tar.gz" + pypi = "h5py/h5py-3.3.0.tar.gz" git = "https://github.com/h5py/h5py.git" - maintainers = ['bryanherman'] + maintainers = ['bryanherman', 'takluyver'] version('master', branch='master') + version('3.3.0', sha256='e0dac887d779929778b3cfd13309a939359cc9e74756fc09af7c527a82797186') version('3.2.1', sha256='89474be911bfcdb34cbf0d98b8ec48b578c27a89fdb1ae4ee7513f1ef8d9249e') version('3.2.0', sha256='4271c1a4b7d87aa76fe96d016368beb05a6c389d64882d58036964ce7d2d03c1') version('3.1.0', sha256='1e2516f190652beedcb8c7acfa1c6fa92d99b42331cbef5e5c7ec2d65b0fc3c2') @@ -61,13 +62,10 @@ class PyH5py(PythonPackage): depends_on('hdf5+mpi', when='+mpi') depends_on('mpi', when='+mpi') depends_on('py-mpi4py', when='@:2.99 +mpi', type=('build', 'run')) - depends_on('py-mpi4py@3.0.0:', when='@3.0.0:+mpi^python@3.0.0:3.7.99', type=('build', 'run')) + depends_on('py-mpi4py@3.0.0:', when='@3.0.0:3.2.99+mpi^python@3.0.0:3.7.99', type=('build', 'run')) + depends_on('py-mpi4py@3.0.2:', when='@3.3.0:+mpi^python@3.0.0:3.7.99', type=('build', 'run')) depends_on('py-mpi4py@3.0.3:', when='@3.0.0:+mpi^python@3.8.0:', type=('build', 'run')) - # For version 3+, patch setup.py to allow setup_requires list to be more abstract. - # Required for offline installations with version 3+ - patch('h5py-3-setuprequires.patch', when="@3.0.0:") - phases = ['configure', 'install'] def setup_build_environment(self, env): @@ -76,6 +74,10 @@ class PyH5py(PythonPackage): env.set('CC', self.spec['mpi'].mpicc) env.set('HDF5_MPI', 'ON') + # Disable build requirements meant for Python build tools, which pin + # versions of numpy & mpi4py. + env.set('H5PY_SETUP_REQUIRES', '0') + @when('@3.0.0:') def configure(self, spec, prefix): pass |