<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/53ba3ac24b14bc57cca70e540baa13880b814da4">https://github.com/macports/macports-ports/commit/53ba3ac24b14bc57cca70e540baa13880b814da4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 53ba3ac24b14bc57cca70e540baa13880b814da4
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Wed Nov 27 13:36:07 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-pygrib: update to 2.0.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - remove py34 subport
</span><span style='display:block; white-space:pre;color:#404040;'> - add size to checksums
</span><span style='display:block; white-space:pre;color:#404040;'> - remove patch, included upstream
</span><span style='display:block; white-space:pre;color:#404040;'> - explicitly add library dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/48281
</span>---
python/py-pygrib/Portfile | 40 +++++++++++++++++++++++-------
python/py-pygrib/files/patch-setup.py.diff | 11 --------
2 files changed, 31 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygrib/Portfile b/python/py-pygrib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cb3327..69a534c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pygrib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pygrib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,12 +4,12 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-pygrib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.0.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories-append science
license MIT
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> maintainers {fastmail.fm:jswhit @jswhit} openmaintainer
description Python interface to the Grib API library
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,21 +19,43 @@ homepage https://github.com/jswhit/pygrib
</span> master_sites pypi:p/pygrib
distname pygrib-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 54316925506319f5a1dc6049bceccc5659f3d24d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 82eb5e6037217f7ef200521ffc90c59c1db6008ca10d84a5e8ae80008b94ae00
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 34 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5e642f8aabcd41a4b1c846b9d868c0eb333811aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c3a828c1121c686814c2cfe281a7a3be196a22b9754306bf61c3fd65c31f1fcd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21438736
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 35 36
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib-append \
port:py${python.version}-pyproj \
port:py${python.version}-numpy \
port:ecCodes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # add explicit dependencies on libraries (these are dependencies of ecCodes).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix building in trace mode and make it more explicit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:jasper \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openjpeg15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.env-append \
GRIBAPI_DIR=${prefix} \
PNG_DIR=${prefix} \
JASPER_DIR=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OPENJPEG_DIR=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPENJPEG_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZLIB_DIR=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env PYTHONPATH=[glob -nocomplain ${worksrcpath}/build/lib*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.cmd ${python.bin} test.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.type none
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygrib/files/patch-setup.py.diff b/python/py-pygrib/files/patch-setup.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 15efce9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pygrib/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2016-11-19 04:23:03.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2017-11-25 15:24:22.000000000 +0900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- man_dir = config.getq(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "directories", "man_dir", environ.get('MAN_DIR'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- grib_api_libname = config.getq(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "files", "grib_api_libname", 'grib_api')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "files", "grib_api_libname", 'eccodes')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdirs=[]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incdirs=[numpy.get_include()]
</span></pre><pre style='margin:0'>
</pre>