[120500] trunk/dports/python/py-h5py
eborisch at macports.org
eborisch at macports.org
Fri May 30 08:49:48 PDT 2014
Revision: 120500
https://trac.macports.org/changeset/120500
Author: eborisch at macports.org
Date: 2014-05-30 08:49:48 -0700 (Fri, 30 May 2014)
Log Message:
-----------
py-h5py: Update to 2.3.0
Modified Paths:
--------------
trunk/dports/python/py-h5py/Portfile
Added Paths:
-----------
trunk/dports/python/py-h5py/files/mpiposix.patch
Removed Paths:
-------------
trunk/dports/python/py-h5py/files/patch-h5py-h5fd.c.diff
Modified: trunk/dports/python/py-h5py/Portfile
===================================================================
--- trunk/dports/python/py-h5py/Portfile 2014-05-30 15:37:22 UTC (rev 120499)
+++ trunk/dports/python/py-h5py/Portfile 2014-05-30 15:49:48 UTC (rev 120500)
@@ -5,16 +5,14 @@
PortGroup python 1.0
name py-h5py
-version 2.2.1
+version 2.3.0
# h5py needs to be re-built after hdf5-18 upgrades
-revision 2
+revision 0
-# MPIPOSIX driver is removed in hdf5-18 version 1.8.13
-patchfiles patch-h5py-h5fd.c.diff
checksums \
- rmd160 9e5ee73fa28e07e21439cef289b8e1945eccfd4e \
- sha256 b4510cb74aef332847dc88e3df6910d7af68c709b3556fc960a687c56ba6a4cb \
- sha1 4b511ed7aa28ac4c61188a121d42f17f3096c15a
+ rmd160 d2e67d9c46d96c7bf91aacea073f275626e6b551 \
+ sha256 943a08e938fdb553d0dac0e2be90bcec79a71961045a3018ec2b4e86f94feaa9 \
+ sha1 a3b005d5b4e9f21d0f4bcf62f0bdecf01861cf8c
# Support for -devel
set DEV_VERSION 0
@@ -30,12 +28,12 @@
python.version ${DEV_VERSION}
# epoch was already set to a date; continuing with that approach
epoch 20130904
- version 2.2.1
+ version 2.3.0
conflicts py${python.version}-h5py
checksums \
- rmd160 9e5ee73fa28e07e21439cef289b8e1945eccfd4e \
- sha256 b4510cb74aef332847dc88e3df6910d7af68c709b3556fc960a687c56ba6a4cb \
- sha1 4b511ed7aa28ac4c61188a121d42f17f3096c15a
+ rmd160 d2e67d9c46d96c7bf91aacea073f275626e6b551 \
+ sha256 943a08e938fdb553d0dac0e2be90bcec79a71961045a3018ec2b4e86f94feaa9 \
+ sha1 a3b005d5b4e9f21d0f4bcf62f0bdecf01861cf8c
} elseif {${name} ne ${subport}} {
conflicts py${python.version}-h5py-devel
}
@@ -58,12 +56,16 @@
simplifies the process of reading and writing data from Python.
homepage http://www.h5py.org
-master_sites http://h5py.googlecode.com/files/
-distname h5py-${version}
+master_sites https://pypi.python.org/packages/source/h/h5py
+distname h5py-${version}
+# MPIPOSIX driver is removed in hdf5-18 version 1.8.13; upstream patch
+patchfiles mpiposix.patch
if {${name} ne ${subport}} {
+ # Cython is currently required to regenerate files after mpiposix.patch
depends_lib-append port:py${python.version}-numpy \
- port:hdf5-18
+ port:hdf5-18 \
+ port:py${python.version}-cython
post-destroot {
system -W ${destroot}${prefix} "mkdir -p share/doc/${subport}"
Added: trunk/dports/python/py-h5py/files/mpiposix.patch
===================================================================
--- trunk/dports/python/py-h5py/files/mpiposix.patch (rev 0)
+++ trunk/dports/python/py-h5py/files/mpiposix.patch 2014-05-30 15:49:48 UTC (rev 120500)
@@ -0,0 +1,51 @@
+--- h5py/api_functions.txt
++++ h5py/api_functions.txt
+@@ -535,7 +535,6 @@ hdf5:
+
+ MPI herr_t H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
+ MPI herr_t H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm, MPI_Info *info)
+- MPI herr_t H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm, hbool_t hints)
+ MPI 1.8.9 herr_t H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag)
+ MPI 1.8.9 herr_t H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag)
+
+--- h5py/h5fd.pxd
++++ h5py/h5fd.pxd
+@@ -33,7 +33,7 @@ cdef extern from "hdf5.h":
+ # hid_t H5FD_GASS not in 1.8.X
+ hid_t H5FD_LOG
+ hid_t H5FD_MPIO
+- hid_t H5FD_MPIPOSIX
++# hid_t H5FD_MPIPOSIX removed in 1.8.13
+ hid_t H5FD_MULTI
+ hid_t H5FD_SEC2
+ hid_t H5FD_STDIO
+--- h5py/h5fd.pyx
++++ h5py/h5fd.pyx
+@@ -31,7 +31,7 @@ CORE = H5FD_CORE
+ FAMILY = H5FD_FAMILY
+ LOG = H5FD_LOG
+ MPIO = H5FD_MPIO
+-MPIPOSIX = H5FD_MPIPOSIX
++MPIPOSIX = -1
+ MULTI = H5FD_MULTI
+ SEC2 = H5FD_SEC2
+ STDIO = H5FD_STDIO
+--- h5py/h5p.pyx
++++ h5py/h5p.pyx
+@@ -976,14 +976,9 @@ cdef class PropFAID(PropInstanceID):
+ return (pycomm, pyinfo)
+
+ def set_fapl_mpiposix(self, Comm comm not None, bint use_gpfs_hints=0):
+- """ (Comm comm, BOOL use_gpfs_hints=0)
+-
+- Set MPI-POSIX driver.
+-
+- Comm: An mpi4py.MPI.Comm instance
+- use_gpfs_hints: Enable internal hints for GPFS file system
++ """ Obsolete.
+ """
+- H5Pset_fapl_mpiposix(self.id, comm.ob_mpi, use_gpfs_hints)
++ raise RuntimeError("MPI-POSIX driver is broken; removed in h5py 2.3.1")
+
+ def get_mdc_config(self):
+ """() => CacheConfig
Deleted: trunk/dports/python/py-h5py/files/patch-h5py-h5fd.c.diff
===================================================================
--- trunk/dports/python/py-h5py/files/patch-h5py-h5fd.c.diff 2014-05-30 15:37:22 UTC (rev 120499)
+++ trunk/dports/python/py-h5py/files/patch-h5py-h5fd.c.diff 2014-05-30 15:49:48 UTC (rev 120500)
@@ -1,27 +0,0 @@
---- h5py/h5fd.c.orig 2014-05-30 09:05:20.000000000 -0500
-+++ h5py/h5fd.c 2014-05-30 09:06:39.000000000 -0500
-@@ -854,11 +854,12 @@
- * MULTI = H5FD_MULTI
- * SEC2 = H5FD_SEC2
- */
-+ /*
- __pyx_t_1 = __Pyx_PyInt_to_py_hid_t(H5FD_MPIPOSIX); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_GOTREF(__pyx_t_1);
- if (PyObject_SetAttr(__pyx_m, __pyx_n_s__MPIPOSIX, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
- __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
--
-+ */
- /* "h5py/h5fd.pyx":35
- * MPIO = H5FD_MPIO
- * MPIPOSIX = H5FD_MPIPOSIX
---- h5py/h5fd.pyx.orig 2014-05-30 09:10:49.000000000 -0500
-+++ h5py/h5fd.pyx 2014-05-30 09:11:07.000000000 -0500
-@@ -31,7 +31,7 @@
- FAMILY = H5FD_FAMILY
- LOG = H5FD_LOG
- MPIO = H5FD_MPIO
--MPIPOSIX = H5FD_MPIPOSIX
-+#MPIPOSIX = H5FD_MPIPOSIX
- MULTI = H5FD_MULTI
- SEC2 = H5FD_SEC2
- STDIO = H5FD_STDIO
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140530/f9668c72/attachment.html>
More information about the macports-changes
mailing list