<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/b43f999350ae021dbad2fb3ddca3c7ada79d3a74">https://github.com/macports/macports-ports/commit/b43f999350ae021dbad2fb3ddca3c7ada79d3a74</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 b43f999 py*-numpy: update to 1.14.0.
</span>b43f999 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b43f999350ae021dbad2fb3ddca3c7ada79d3a74
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Jan 8 15:43:07 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> py*-numpy: update to 1.14.0.
</span>---
python/py-numpy/Portfile | 6 +++---
python/py-numpy/files/patch-fcompiler_g95.diff | 10 +++-------
python/py-numpy/files/patch-numpy_core_setup.py.diff | 4 ++--
.../py-numpy/files/patch-numpy_distutils_fcompiler_gnu.py.diff | 2 +-
python/py-numpy/files/patch-numpy_tests_test_scripts.py.diff | 6 +++---
5 files changed, 12 insertions(+), 16 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 05b2516..3fc2e12 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;'>@@ -13,9 +13,9 @@ maintainers {michaelld @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;'>-github.setup numpy numpy 1.13.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 bdc1b9dedf466aaa1bf721972fce2ade5c1a2fe3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4bdde66e14ba0899f61d568a111ea079f47542d714a2a398f2de41a0d64431f2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup numpy numpy 1.14.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1626ff09eb2aa4cd4ab3b6ed311436f379540765 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af480180ad5d5b6dec9b8cbe0ff10246dff0f62bc9d5c3d6a4bdb68428595add
</span>
if {${name} ne ${subport}} {
# the python PortGroup puts compiler names in build.env and destroot.env
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-fcompiler_g95.diff b/python/py-numpy/files/patch-fcompiler_g95.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b95a260..9e1e773 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-fcompiler_g95.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-fcompiler_g95.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- numpy/distutils/fcompiler/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/distutils/fcompiler/__init__.py.orig
</span> +++ numpy/distutils/fcompiler/__init__.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -708,11 +708,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('win32', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'intelvem', 'intelem')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -739,7 +739,7 @@
</span> ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 'intele', 'intelem', 'gnu', 'g95', 'pathf95')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')),
</span> - ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
+ ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'pg')),
('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
('irix.*', ('mips', 'gnu', 'gnu95',)),
('aix.*', ('ibm', 'gnu', 'gnu95',)),
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # os.name mappings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('posix', ('gnu', 'gnu95',)),
</span><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 6eb5281..3036a28 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;'>-@@ -473,7 +473,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -474,7 +474,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;'>-@@ -574,7 +581,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -575,7 +582,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 e570575..3c32666 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,6 +1,6 @@
</span> --- numpy/distutils/fcompiler/gnu.py.orig
+++ numpy/distutils/fcompiler/gnu.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -236,8 +236,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,8 +257,7 @@
</span> return []
def runtime_library_dir_option(self, dir):
<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><span style='display:block; white-space:pre;color:#808080;'>index fb071d0..b71305c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.diff
</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;'>@@ -1,6 +1,6 @@
</span> --- numpy/tests/test_scripts.py.orig
+++ numpy/tests/test_scripts.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@
</span> major = str(version.major)
minor = str(version.minor)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,9 +9,9 @@
</span> success = False
for f2py_cmd in f2py_cmds:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,5 +89,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,5 +88,5 @@
</span> break
<span style='display:block; white-space:pre;background:#ffe0e0;'>- except:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ except Exception:
</span> pass
- msg = "Warning: neither %s nor %s nor %s found in path" % f2py_cmds
+ msg = "Warning: none of %s, %s, %s, nor %s found in path" % f2py_cmds
</pre><pre style='margin:0'>
</pre>