<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120500] trunk/dports/python/py-h5py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120500">120500</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2014-05-30 08:49:48 -0700 (Fri, 30 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-h5py: Update to 2.3.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyh5pyPortfile">trunk/dports/python/py-h5py/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyh5pyfilesmpiposixpatch">trunk/dports/python/py-h5py/files/mpiposix.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyh5pyfilespatchh5pyh5fdcdiff">trunk/dports/python/py-h5py/files/patch-h5py-h5fd.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyh5pyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-h5py/Portfile (120499 => 120500)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,16 +5,14 @@
</span><span class="cx"> PortGroup python 1.0
</span><span class="cx">
</span><span class="cx"> name py-h5py
</span><del>-version 2.2.1
</del><ins>+version 2.3.0
</ins><span class="cx"> # h5py needs to be re-built after hdf5-18 upgrades
</span><del>-revision 2
</del><ins>+revision 0
</ins><span class="cx">
</span><del>-# MPIPOSIX driver is removed in hdf5-18 version 1.8.13
-patchfiles patch-h5py-h5fd.c.diff
</del><span class="cx"> checksums \
</span><del>- rmd160 9e5ee73fa28e07e21439cef289b8e1945eccfd4e \
- sha256 b4510cb74aef332847dc88e3df6910d7af68c709b3556fc960a687c56ba6a4cb \
- sha1 4b511ed7aa28ac4c61188a121d42f17f3096c15a
</del><ins>+ rmd160 d2e67d9c46d96c7bf91aacea073f275626e6b551 \
+ sha256 943a08e938fdb553d0dac0e2be90bcec79a71961045a3018ec2b4e86f94feaa9 \
+ sha1 a3b005d5b4e9f21d0f4bcf62f0bdecf01861cf8c
</ins><span class="cx">
</span><span class="cx"> # Support for -devel
</span><span class="cx"> set DEV_VERSION 0
</span><span class="lines">@@ -30,12 +28,12 @@
</span><span class="cx"> python.version ${DEV_VERSION}
</span><span class="cx"> # epoch was already set to a date; continuing with that approach
</span><span class="cx"> epoch 20130904
</span><del>- version 2.2.1
</del><ins>+ version 2.3.0
</ins><span class="cx"> conflicts py${python.version}-h5py
</span><span class="cx"> checksums \
</span><del>- rmd160 9e5ee73fa28e07e21439cef289b8e1945eccfd4e \
- sha256 b4510cb74aef332847dc88e3df6910d7af68c709b3556fc960a687c56ba6a4cb \
- sha1 4b511ed7aa28ac4c61188a121d42f17f3096c15a
</del><ins>+ rmd160 d2e67d9c46d96c7bf91aacea073f275626e6b551 \
+ sha256 943a08e938fdb553d0dac0e2be90bcec79a71961045a3018ec2b4e86f94feaa9 \
+ sha1 a3b005d5b4e9f21d0f4bcf62f0bdecf01861cf8c
</ins><span class="cx"> } elseif {${name} ne ${subport}} {
</span><span class="cx"> conflicts py${python.version}-h5py-devel
</span><span class="cx"> }
</span><span class="lines">@@ -58,12 +56,16 @@
</span><span class="cx"> simplifies the process of reading and writing data from Python.
</span><span class="cx">
</span><span class="cx"> homepage http://www.h5py.org
</span><del>-master_sites http://h5py.googlecode.com/files/
-distname h5py-${version}
</del><ins>+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
</ins><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><ins>+ # Cython is currently required to regenerate files after mpiposix.patch
</ins><span class="cx"> depends_lib-append port:py${python.version}-numpy \
</span><del>- port:hdf5-18
</del><ins>+ port:hdf5-18 \
+ port:py${python.version}-cython
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> system -W ${destroot}${prefix} "mkdir -p share/doc/${subport}"
</span></span></pre></div>
<a id="trunkdportspythonpyh5pyfilesmpiposixpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-h5py/files/mpiposix.patch (0 => 120500)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+--- 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
</ins></span></pre></div>
<a id="trunkdportspythonpyh5pyfilespatchh5pyh5fdcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/python/py-h5py/files/patch-h5py-h5fd.c.diff (120499 => 120500)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,27 +0,0 @@
</span><del>---- 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
</del></span></pre>
</div>
</div>
</body>
</html>