Commit 21ff7977 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'add-h5py'

e80655c3 h5py: add to packages
b5570f2d

 h5py: add project
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !844
parents fd244249 e80655c3
......@@ -8,6 +8,7 @@ set(ENABLE_ffmpeg ON CACHE BOOL "")
set(ENABLE_fortran ON CACHE BOOL "")
set(ENABLE_gdal ON CACHE BOOL "")
set(ENABLE_gmsh ON CACHE BOOL "")
set(ENABLE_h5py ON CACHE BOOL "")
set(ENABLE_matplotlib ON CACHE BOOL "")
set(ENABLE_mesa ON CACHE BOOL "")
set(ENABLE_mili ON CACHE BOOL "")
......
......@@ -47,6 +47,7 @@ function (superbuild_find_projects var)
freetype
gdal
hdf5
h5py
ispc
las
lookingglass
......@@ -80,6 +81,7 @@ function (superbuild_find_projects var)
pythonkiwisolver
pythonmako
pythonpandas
pythonpkgconfig
pythonpygments
pythonpyparsing
pythonsetuptools
......
superbuild_add_project_python(h5py
PACKAGE semantic_version
DEPENDS hdf5 pythonsetuptools pythoncython numpy pythonpkgconfig
DEPENDS_OPTIONAL pythonmpi4py
PROCESS_ENVIRONMENT
HDF5_DIR <INSTALL_DIR>)
superbuild_apply_patch(h5py minvers
"Don't pin dependencies to exact versions during the build")
......@@ -80,6 +80,7 @@ macro (check_for_python_module project module)
endif ()
endmacro ()
check_for_python_module(h5py h5py)
check_for_python_module(matplotlib matplotlib)
check_for_python_module(matplotlib mpl_toolkits)
check_for_python_module(numpy numpy)
......
diff -u -Nru5 h5py-3.2.0/setup.py h5py-3.2.0.minvers/setup.py
--- h5py-3.2.0/setup.py 2021-03-03 04:27:49.000000000 -0500
+++ h5py-3.2.0.minvers/setup.py 2021-03-03 13:14:34.222341278 -0500
@@ -47,18 +47,18 @@
'pkgconfig',
"Cython >=0.29; python_version<'3.8'",
"Cython >=0.29.14; python_version=='3.8'",
"Cython >=0.29.15; python_version>='3.9'",
] + [
- 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.
if os.environ.get('H5PY_SETUP_REQUIRES', '1') == '0':
SETUP_REQUIRES = []
set(pythonpkgconfig_depends)
if (UNIX)
list(APPEND pythonpkgconfig_depends
pkgconf)
endif ()
superbuild_add_project_python(pythonpkgconfig
PACKAGE pkgconfig
DEPENDS pythonsetuptools ${pythonpkgconfig_depends})
......@@ -255,3 +255,11 @@ superbuild_set_revision(launchers
superbuild_set_revision(openpmd
URL "https://www.paraview.org/files/dependencies/openPMD-api-0.12.0-alpha.tar.gz"
URL_MD5 "ada986539b4d2cc004888f161f41de85")
superbuild_set_revision(pythonpkgconfig
URL "https://www.paraview.org/files/dependencies/pkgconfig-1.5.2.tar.gz"
URL_MD5 "0d889edf670b644bfeaa3bb9444169cb")
superbuild_set_revision(h5py
URL "https://www.paraview.org/files/dependencies/h5py-3.2.0.tar.gz"
URL_MD5 "4b7ebc5d42bea9c264857a516c39ee3e")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment