<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/e722add7feca5ce30c2c09736e8d917c132ae652">https://github.com/macports/macports-ports/commit/e722add7feca5ce30c2c09736e8d917c132ae652</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 e722add py-numpy: update to 1.17.0
</span>e722add is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e722add7feca5ce30c2c09736e8d917c132ae652
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Jul 29 15:42:50 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-numpy: update to 1.17.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> NumPy 1.17.0 requires Py35 or later, so add a special clause for Py27 and Py34, currently at the prior version: 1.16.4.
</span>---
python/py-numpy/Portfile | 18 +++++--
python/py-numpy/files/patch-fcompiler_g95.34.diff | 11 ++++
...p.py.diff => patch-numpy_core_setup.py.34.diff} | 0
.../py-numpy/files/patch-numpy_core_setup.py.diff | 60 +++++++++++-----------
.../patch-numpy_tests_test_scripts.py.34.diff | 11 ++++
5 files changed, 66 insertions(+), 34 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 746690e..793e871 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,10 +13,10 @@ 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.16.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a5a18f70e57962b9691eeef28bae9f0c3851279f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 86e12b00ca36643c63184b5e45373727603a9e073177f24ce2c4b5a4a9dabc04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4676166
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup numpy numpy 1.17.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1d7293c960075dce0c81b928ea6eb7347f1f8435 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a2127c41b0ae6602fb510fced5a05db63a953a08a9d792ecc95e636dd0f6c4a5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5054254
</span> revision 0
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,6 +41,7 @@ if {${name} ne ${subport}} {
</span> checksums rmd160 8cc323d5944301aefa1f66f17d4af14c364c6b32 \
sha256 dbdda9104c7dbc2d8ae691367a2bb1815a62598c5278097b4eee035b85abf6a1 \
size 4387593
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> patchfiles-append patch-numpy_core_setup.py.26.diff \
patch-numpy_distutils_fcompiler_gnu.py.26.diff \
patch-numpy_tests_test_scripts.py.26.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +51,15 @@ if {${name} ne ${subport}} {
</span> reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
${worksrcpath}/numpy/f2py/setup.py
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${python.version} == 27 || ${python.version} == 34} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup numpy numpy 1.16.4 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 a5a18f70e57962b9691eeef28bae9f0c3851279f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 86e12b00ca36643c63184b5e45373727603a9e073177f24ce2c4b5a4a9dabc04 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4676166
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-numpy_core_setup.py.34.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-numpy_tests_test_scripts.py.34.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fcompiler_g95.34.diff
</span> } else {
patchfiles-append patch-numpy_core_setup.py.diff \
patch-numpy_tests_test_scripts.py.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-fcompiler_g95.34.diff b/python/py-numpy/files/patch-fcompiler_g95.34.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3270680
</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-fcompiler_g95.34.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/distutils/fcompiler/__init__.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/distutils/fcompiler/__init__.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -751,7 +751,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'pg')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('irix.*', ('mips', 'gnu', 'gnu95',)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('aix.*', ('ibm', '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.34.diff
</span>similarity index 100%
copy from python/py-numpy/files/patch-numpy_core_setup.py.diff
copy to python/py-numpy/files/patch-numpy_core_setup.py.34.diff
<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 c069cc5..2160492 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,34 +1,34 @@
</span> --- numpy/core/setup.py.orig
+++ numpy/core/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -466,7 +466,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#endif\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -473,7 +473,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#endif\n')
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # define inline to our keyword, or nothing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_f.write('#ifndef __cplusplus\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -567,7 +574,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if d[0]!='NPY_SIZEOF_LONG' and d[0]!='NPY_SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_f.write('#endif\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define inline to our keyword, or nothing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_f.write('#ifndef __cplusplus\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -571,7 +578,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if isinstance(d, str):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_f.write('#define %s\n' % (d))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], d[1]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#ifdef __LP64__\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], 8))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#else\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#define %s %s\n' % (d[0], 4))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_f.write('#endif\n')
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_f.write("""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Define __STDC_FORMAT_MACROS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_f.write(textwrap.dedent("""
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.34.diff b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.34.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..600eded
</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.34.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</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;'>+@@ -32,7 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = sys.version_info
</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;'>+- return ['f2py', 'f2py' + major, 'f2py' + major + '.' + minor]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ['f2py', 'f2py' + major, 'f2py' + major + '.' + minor, 'f2py-' + major + '.' + minor]
</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;'>+ @pytest.mark.skipif(is_inplace, reason="Cannot test f2py command inplace")
</span></pre><pre style='margin:0'>
</pre>