<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/3c725fe7a4c4a2a0da7f4ac158b4edf4a989e93f">https://github.com/macports/macports-ports/commit/3c725fe7a4c4a2a0da7f4ac158b4edf4a989e93f</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 3c725fe py-numpy: update to 1.16.1
</span>3c725fe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3c725fe7a4c4a2a0da7f4ac158b4edf4a989e93f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Feb 13 11:06:39 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-numpy: update to 1.16.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + move f2py patch to be just for legacy NumPy install;
</span><span style='display:block; white-space:pre;color:#404040;'> + disable gnu.py patch since it seems to break dependent installs (e.g., SciPy).
</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/58007
</span>---
python/py-numpy/Portfile | 22 ++++++++++++----------
python/py-numpy/files/patch-fcompiler_g95.diff | 2 +-
.../py-numpy/files/patch-numpy_core_setup.py.diff | 4 ++--
.../patch-numpy_distutils_fcompiler_gnu.py.diff | 9 +++++++--
.../files/patch-numpy_tests_test_scripts.py.diff | 17 +++++------------
5 files changed, 27 insertions(+), 27 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 4f375d5..ff49a6f 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,11 @@ 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.15.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 98553651755714052a834f4d5fb70ff365dd6693 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 16618e1ce2147a99f1a381e111bf821f45b0aa645814f963d11fba5acec4cb9e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4418653
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup numpy numpy 1.16.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a77b2a86b434f4907dafbdcdf878980707b94ccf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 08c907b800daf72bdccbe0a08f4b54e20362efa3d46644cc56d338dec18cc99a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4668278
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</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;'>@@ -43,18 +44,21 @@ if {${name} ne ${subport}} {
</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:#ffe0e0;'>- patch-fcompiler_g95.26.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fcompiler_g95.26.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-f2py_setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/numpy/f2py/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
patchfiles-append patch-numpy_core_setup.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-numpy_distutils_fcompiler_gnu.py.diff \
</span> patch-numpy_tests_test_scripts.py.diff \
patch-fcompiler_g95.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch-numpy_distutils_fcompiler_gnu.py.diff
</span> }
compilers.setup require_fortran -clang -gcc44 -gcc45 \
-gcc46 -gcc47 -gcc48 -g95 clang37
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-f2py_setup.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:fftw-3 \
port:py${python.version}-nose \
port:py${python.version}-cython
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,8 +148,6 @@ variant."
</span> }
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/numpy/f2py/setup.py
</span>
# https://trac.macports.org/ticket/46392
if {${os.arch} eq "powerpc"} {
<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 9e1e773..3270680 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,6 +1,6 @@
</span> --- numpy/distutils/fcompiler/__init__.py.orig
+++ numpy/distutils/fcompiler/__init__.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -739,7 +739,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -751,7 +751,7 @@
</span> ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'absoft', 'nag', 'vast', 'compaq',
'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor')),
<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 6836b0c..c069cc5 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;'>-@@ -465,7 +465,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -466,7 +466,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;'>-@@ -566,7 +573,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -567,7 +574,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 3c32666..b1cf7d0 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,12 +1,17 @@
</span> --- numpy/distutils/fcompiler/gnu.py.orig
+++ numpy/distutils/fcompiler/gnu.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -257,8 +257,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -265,13 +265,7 @@
</span> return []
def runtime_library_dir_option(self, dir):
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- if sys.platform[:3] == 'aix' or sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Linux/Solaris/Unix support RPATH, Windows and AIX do not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- raise NotImplementedError
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> - sep = ',' if sys.platform == 'darwin' else '='
- return '-Wl,-rpath%s"%s"' % (sep, dir)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> + return '-Wl,-rpath -Wl,"%s"' % dir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> class Gnu95FCompiler(GnuFCompiler):
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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><span style='display:block; white-space:pre;color:#808080;'>index eb32d38..600eded 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,18 +1,11 @@
</span> --- numpy/tests/test_scripts.py.orig
+++ numpy/tests/test_scripts.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,7 +79,7 @@
</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> major = str(version.major)
minor = str(version.minor)
<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:#ffe0e0;'>-- f2py_cmds = ('f2py', 'f2py' + major, 'f2py' + major + '.' + minor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ f2py_cmds = ('f2py', 'f2py' + major, 'f2py' + major + '.' + minor, 'f2py-' + major + '.' + minor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- success = False
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- for f2py_cmd in f2py_cmds:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,5 +90,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except Exception:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- msg = "Warning: neither %s nor %s nor %s found in path" % f2py_cmds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ msg = "Warning: none of %s, %s, %s, nor %s found in path" % f2py_cmds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert_(success, msg)
</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>