From f55fa15f73a21025ca998944366b3eca54f76944 Mon Sep 17 00:00:00 2001 From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com> Date: Mon, 2 Oct 2023 17:05:26 -0500 Subject: [PATCH] Updated versioning of dependency python packages and got rid of some cruft in the hdf5 build script --- buildscripts/build_hdf5.sh | 20 -------------------- pyproject.toml | 5 +++-- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/buildscripts/build_hdf5.sh b/buildscripts/build_hdf5.sh index 5fa0148a4..97106c03e 100755 --- a/buildscripts/build_hdf5.sh +++ b/buildscripts/build_hdf5.sh @@ -12,7 +12,6 @@ # If not, see: https://www.gnu.org/licenses. HDF5_VER="1_14_2" -PLUGIN_VER="1.14.0" ZLIB_VER="1.3" SCRIPT_DIR=$(realpath $(dirname $0)) @@ -48,13 +47,6 @@ if [[ (-d ${DEPENDENCY_DIR}/hdfsrc) && (-f ${DEPENDENCY_DIR}/hdfsrc/README.md) ] fi fi -if [ ! -d ${DEPENDENCY_DIR}/hdfsrc ]; then - curl -s -L https://github.com/HDFGroup/hdf5/releases/download/hdf5-${HDF5_VER}/hdf5-${HDF5_VER}.tar.gz | tar xvz -C ${DEPENDENCY_DIR} - ZLIB_TGZ_NAME="zlib-${ZLIB_VER}.tar.gz" - ZLIB_TGZ_ORIGPATH="https://github.com/madler/zlib/releases/download/v${ZLIB_VER}/" - curl -L "https://github.com/HDFGroup/hdf5_plugins/archive/refs/tags/${PLUGIN_VER}.tar.gz" -o hdfsrc/hdf5_plugins.tar.gz -fi - printf "\n" printf "*********************************************************\n" printf "* BUILDING HDF5 LIBRARY *\n" @@ -105,18 +97,6 @@ else sudo cmake --install build fi -# tar xvzf hdf5_plugins.tar.gz -# PLUGIN_SOURCE=hdf5_plugins-${PLUGIN_VER} - -# BUILD_OPTIONS="-DTGZPATH:PATH=${PLUGIN_SOURCE}/libs -DH5PL_ALLOW_EXTERNAL_SUPPORT:STRING=\"TGZ\"" -# cmake -B ${PLUGIN_SOURCE}/build -C ${PLUGIN_SOURCE}/config/cmake/cacheinit.cmake -DCMAKE_BUILD_TYPE:STRING=Release ${BUILD_OPTIONS} -G Ninja ${PLUGIN_SOURCE} -# cmake --build ${PLUGIN_SOURCE}/build -j${NPROC} --config Release -# if [ -w ${PREFIX} ]; then -# cmake --install ${PLUGIN_SOURCE}/build -# else -# sudo cmake --install ${PLUGIN_SOURCE}/build -# fi - if [ $? -ne 0 ]; then printf "hdf5 could not be compiled.\n" exit 1 diff --git a/pyproject.toml b/pyproject.toml index bb22467c7..dd6d5a0c1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,8 +30,9 @@ dependencies = [ 'dask>=2022.1', 'distributed>=2022.1', 'bottleneck>=1.3.5', - 'h5netcdf>=1.0.2', - 'netcdf4>=1.6.2', + 'h5netcdf>=1.2.0', + 'h5py>=3.9.0', + 'netcdf4>=1.6.4', 'matplotlib>=3.7.1', 'astropy>=5.1', 'astroquery>=0.4.6',