<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5fa892977bf6539c533bfb3e5147002e167bccbe">https://github.com/macports/macports-ports/commit/5fa892977bf6539c533bfb3e5147002e167bccbe</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5fa8929 py*-numpy: update to 1.12.0; fix f2py tests to work with how MacPorts installs f2py.
</span>5fa8929 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5fa892977bf6539c533bfb3e5147002e167bccbe
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Jan 18 22:21:57 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> py*-numpy: update to 1.12.0; fix f2py tests to work with how MacPorts installs f2py.
</span>---
python/py-numpy/Portfile | 9 +++++----
python/py-numpy/files/patch-numpy_core_setup.py.diff | 4 ++--
.../files/patch-numpy_distutils_fcompiler_gnu.py.diff | 7 ++++---
.../files/patch-numpy_tests_test_scripts.py.diff | 18 ++++++++++++++++++
4 files changed, 29 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/Portfile b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19f96d3..e6eaebb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span> PortGroup github 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup numpy numpy 1.11.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup numpy numpy 1.12.0 v
</span> name py-numpy
categories-append math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +15,8 @@ maintainers michaelld openmaintainer
</span> description The core utilities for the scientific library scipy for Python
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8cc323d5944301aefa1f66f17d4af14c364c6b32 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dbdda9104c7dbc2d8ae691367a2bb1815a62598c5278097b4eee035b85abf6a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cf1d811d28e0d4e30782646689f582ac887f537f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ac29a33ab19e17f8475e0eee2ee5cbeb2ec9e4af355a05f7f188ebf643935ca5
</span>
if {${name} ne ${subport}} {
# the python PortGroup puts compiler names in build.env and destroot.env
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,8 @@ if {${name} ne ${subport}} {
</span> patchfiles patch-f2py_setup.py.diff \
patch-fcompiler_g95.diff \
patch-numpy_core_setup.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-numpy_distutils_fcompiler_gnu.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-numpy_distutils_fcompiler_gnu.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-numpy_tests_test_scripts.py.diff
</span>
depends_lib-append port:fftw-3 \
port:py${python.version}-nose \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_core_setup.py.diff b/python/py-numpy/files/patch-numpy_core_setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b341226..48fc634 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_core_setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_core_setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- numpy/core/setup.py.orig
+++ numpy/core/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -460,7 +460,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -469,7 +469,14 @@
</span> if isinstance(d, str):
target_f.write('#define %s\n' % (d))
else:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@
</span>
# define inline to our keyword, or nothing
target_f.write('#ifndef __cplusplus\n')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -557,7 +564,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -566,7 +573,14 @@
</span> if isinstance(d, str):
target_f.write('#define %s\n' % (d))
else:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.diff b/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a4bbb6..24c0a93 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span> --- numpy/distutils/fcompiler/gnu.py.orig
+++ numpy/distutils/fcompiler/gnu.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -230,7 +230,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -235,8 +235,7 @@
</span> return []
def runtime_library_dir_option(self, dir):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return '-Wl,-rpath="%s"' % dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sep = ',' if sys.platform == 'darwin' else '='
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return '-Wl,-rpath%s"%s"' % (sep, dir)
</span> + return '-Wl,-rpath -Wl,"%s"' % dir
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> class Gnu95FCompiler(GnuFCompiler):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler_type = 'gnu95'
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.diff b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fb071d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/tests/test_scripts.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/tests/test_scripts.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ major = str(version.major)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minor = str(version.minor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- f2py_cmds = ('f2py', 'f2py' + major, 'f2py' + major + '.' + minor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ f2py_cmds = ('f2py', 'f2py' + major, 'f2py' + major + '.' + minor, 'f2py-' + major + '.' + minor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ success = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for f2py_cmd in f2py_cmds:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,5 +89,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- msg = "Warning: neither %s nor %s nor %s found in path" % f2py_cmds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ msg = "Warning: none of %s, %s, %s, nor %s found in path" % f2py_cmds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ assert_(success, msg)
</span></pre><pre style='margin:0'>
</pre>