<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/aff2ee944f3e34f9662d15bebb0f6ed89bd08efa">https://github.com/macports/macports-ports/commit/aff2ee944f3e34f9662d15bebb0f6ed89bd08efa</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 aff2ee944f3 py-numpy: cap py36 at 1.19.X and redo patches per capped version
</span>aff2ee944f3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aff2ee944f3e34f9662d15bebb0f6ed89bd08efa
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Feb 9 20:16:16 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-numpy: cap py36 at 1.19.X and redo patches per capped version
</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/62243
</span>---
python/py-numpy/Portfile | 51 +++++++++++++---------
python/py-numpy/files/patch-arm64_min.27.diff | 40 +++++++++++++++++
python/py-numpy/files/patch-arm64_min.35.diff | 40 +++++++++++++++++
python/py-numpy/files/patch-arm64_min.36.diff | 40 +++++++++++++++++
python/py-numpy/files/patch-fcompiler_g95.35.diff | 11 +++++
python/py-numpy/files/patch-fcompiler_g95.36.diff | 11 +++++
.../files/patch-numpy_core_setup.py.35.diff | 34 +++++++++++++++
.../files/patch-numpy_core_setup.py.36.diff | 34 +++++++++++++++
...py.diff => patch-numpy_linalg_setup.py.27.diff} | 6 +--
...py.diff => patch-numpy_linalg_setup.py.35.diff} | 6 +--
...py.diff => patch-numpy_linalg_setup.py.36.diff} | 6 +--
.../files/patch-numpy_linalg_setup.py.diff | 6 +--
.../patch-numpy_tests_test_scripts.py.35.diff | 11 +++++
.../patch-numpy_tests_test_scripts.py.36.diff | 11 +++++
14 files changed, 274 insertions(+), 33 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 0ae215fe182..a18e94d06da 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;'>@@ -48,34 +48,48 @@ compiler.cxx_standard 2011
</span> github.livecheck.regex {(\d+(?:\.\d+)+)}
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PATCH_PY_EXT ""
</span> if {${python.version} == 27} {
github.setup numpy numpy 1.16.6 v
checksums rmd160 cbb34cf0981ea142ff45722d05a9daad20a134ea \
sha256 2dce87065d5de1a83485cfb3de5e4e793787890f5c1dcc3536a9cabf2e1620af \
size 4691852
revision 2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PATCH_PY_EXT ".27"
</span> patchfiles-append patch-cpu-detection.py.27.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-numpy_core_setup.py.27.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-numpy_tests_test_scripts.py.27.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fcompiler_g95.27.diff
</span> livecheck.url https://numpy.org/doc/stable/release.html
livecheck.regex {(1\.16(?:\.\d+)+)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-numpy_core_setup.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-numpy_tests_test_scripts.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fcompiler_g95.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-arm64_min.diff
</span><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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} == 35} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${python.version} == 35} {
</span> github.setup numpy numpy 1.18.5 v
checksums rmd160 c14f2725afe0f7420d69a6f9ed5744639a2d2b31 \
sha256 4a421fdf82dbb3dce7e62400f69c43722b530db109c3321c6c95452f166560d9 \
size 5167349
revision 1
patchfiles-append patch-cpu-detection.py.35.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.livecheck.regex {(1\.18(?:\.\d+)+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PATCH_PY_EXT ".35"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://numpy.org/doc/stable/release.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {(1\.18(?:\.\d+)+)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${python.version} == 36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup numpy numpy 1.19.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 66861032bbd7c1f7e7741d913c9edf6c0b8be68a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 40e0a919cb8741556f8402cb7ec862b3b27903725ba59af44fd5b88620c5a7e1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7037758
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # because I pushed 1.20 and it requires Py37+ and so reverting back to 1.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PATCH_PY_EXT ".36"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url https://numpy.org/doc/stable/release.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex {(1\.19(?:\.\d+)+)}
</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;'>+ patchfiles-append patch-numpy_core_setup.py${PATCH_PY_EXT}.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-numpy_tests_test_scripts.py${PATCH_PY_EXT}.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fcompiler_g95${PATCH_PY_EXT}.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-arm64_min${PATCH_PY_EXT}.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset atlas] || [variant_isset openblas]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force LDFLAGS for correct linking of the modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # for non-Apple GCC compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-numpy_linalg_setup.py${PATCH_PY_EXT}.diff
</span> }
compilers.setup -clang -gcc44 -gcc45 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,10 +143,6 @@ if {${name} ne ${subport}} {
</span> supported_archs ppc ppc64
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # force LDFLAGS for correct linking of the linalg module
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for non-Apple GCC compilers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-numpy_linalg_setup.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-fetch {
# numpy needs fortran; so we only need to check if atlas is
# compiled with +nofortran
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,9 +173,6 @@ variant."
</span> ATLAS=None
destroot.env-append OPENBLAS=${prefix}/lib \
ATLAS=None
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # force LDFLAGS for correct linking of the modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # for non-Apple GCC compilers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-numpy_linalg_setup.py.diff
</span>
} else {
# use Accelerate BLAS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,7 +187,9 @@ variant."
</span> }
platform darwin 8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Tiger-without-dflcn-header.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python_version} < 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-Tiger-without-dflcn-header.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-arm64_min.27.diff b/python/py-numpy/files/patch-arm64_min.27.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..089c16429c1
</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-arm64_min.27.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/distutils/system_info.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/distutils/system_info.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1911,27 +1911,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the system BLAS from Accelerate or vecLib under OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ intel = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arm = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if get_platform()[-4:] == 'i386' or 'intel' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'x86_64' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'i386' in platform.platform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ intel = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- intel = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if get_platform()[-5:] == 'arm64' or 'arm' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'arm' in platform.platform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arm = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (os.path.exists('/System/Library/Frameworks'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/Accelerate.framework/') and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'accelerate' in libraries):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if intel:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-msse3'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-faltivec'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-I/System/Library/Frameworks/vecLib.framework/Headers'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-I/System/Library/Frameworks/Accelerate.framework/Headers'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args.extend(['-Wl,-framework', '-Wl,Accelerate'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif (os.path.exists('/System/Library/Frameworks'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/vecLib.framework/') and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'veclib' in libraries):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if intel:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-msse3'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-faltivec'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend([
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-arm64_min.35.diff b/python/py-numpy/files/patch-arm64_min.35.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..729f78dc2b7
</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-arm64_min.35.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/distutils/system_info.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/distutils/system_info.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2326,27 +2326,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the system BLAS from Accelerate or vecLib under OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ intel = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arm = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if get_platform()[-4:] == 'i386' or 'intel' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'x86_64' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'i386' in platform.platform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ intel = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- intel = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if get_platform()[-5:] == 'arm64' or 'arm' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'arm' in platform.platform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arm = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (os.path.exists('/System/Library/Frameworks'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/Accelerate.framework/') and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'accelerate' in libraries):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if intel:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-msse3'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-faltivec'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-I/System/Library/Frameworks/vecLib.framework/Headers'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-I/System/Library/Frameworks/Accelerate.framework/Headers'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args.extend(['-Wl,-framework', '-Wl,Accelerate'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif (os.path.exists('/System/Library/Frameworks'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/vecLib.framework/') and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'veclib' in libraries):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if intel:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-msse3'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-faltivec'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend([
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-arm64_min.36.diff b/python/py-numpy/files/patch-arm64_min.36.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6a9d32fc396
</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-arm64_min.36.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/distutils/system_info.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/distutils/system_info.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2342,27 +2342,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use the system BLAS from Accelerate or vecLib under OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ intel = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arm = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if get_platform()[-4:] == 'i386' or 'intel' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'x86_64' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'i386' in platform.platform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ intel = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- intel = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if get_platform()[-5:] == 'arm64' or 'arm' in get_platform() or \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'arm' in platform.platform():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ arm = 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (os.path.exists('/System/Library/Frameworks'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/Accelerate.framework/') and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'accelerate' in libraries):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if intel:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-msse3'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-faltivec'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '-I/System/Library/Frameworks/vecLib.framework/Headers'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-I/System/Library/Frameworks/Accelerate.framework/Headers'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_args.extend(['-Wl,-framework', '-Wl,Accelerate'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif (os.path.exists('/System/Library/Frameworks'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '/vecLib.framework/') and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'veclib' in libraries):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if intel:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-msse3'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif arm:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pass
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend(['-faltivec'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ args.extend([
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-fcompiler_g95.35.diff b/python/py-numpy/files/patch-fcompiler_g95.35.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3270680dca5
</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.35.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-fcompiler_g95.36.diff b/python/py-numpy/files/patch-fcompiler_g95.36.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fa5817c6767
</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.36.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;'>+@@ -747,7 +747,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', 'nv', '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.35.diff b/python/py-numpy/files/patch-numpy_core_setup.py.35.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f7797dd5be9
</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_core_setup.py.35.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/core/setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/core/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -479,7 +479,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:#e0ffe0;'>+
</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;'>+@@ -577,7 +584,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:#e0ffe0;'>+
</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_core_setup.py.36.diff b/python/py-numpy/files/patch-numpy_core_setup.py.36.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d4ffbe95f9a
</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_core_setup.py.36.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- numpy/core/setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ numpy/core/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -481,7 +481,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:#e0ffe0;'>+
</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;'>+@@ -579,7 +586,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:#e0ffe0;'>+
</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_linalg_setup.py.diff b/python/py-numpy/files/patch-numpy_linalg_setup.py.27.diff
</span>similarity index 87%
copy from python/py-numpy/files/patch-numpy_linalg_setup.py.diff
copy to python/py-numpy/files/patch-numpy_linalg_setup.py.27.diff
<span style='display:block; white-space:pre;color:#808080;'>index 2873149da73..4575f5ba650 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_linalg_setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_linalg_setup.py.27.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- numpy/linalg/setup.py.orig
+++ numpy/linalg/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,6 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +64,7 @@
</span> sources=['lapack_litemodule.c', get_lapack_lite_sources],
depends=['lapack_lite/f2c.h'],
extra_info=lapack_info,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,11 +8,11 @@
</span> )
# umath_linalg module
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,6 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +74,7 @@
</span> depends=['lapack_lite/f2c.h'],
extra_info=lapack_info,
libraries=['npymath'],
+ extra_link_args=['-Wl,-undefined,dynamic_lookup', '-bundle']
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_data_files('*.pyi')
</span> return config
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_linalg_setup.py.diff b/python/py-numpy/files/patch-numpy_linalg_setup.py.35.diff
</span>similarity index 87%
copy from python/py-numpy/files/patch-numpy_linalg_setup.py.diff
copy to python/py-numpy/files/patch-numpy_linalg_setup.py.35.diff
<span style='display:block; white-space:pre;color:#808080;'>index 2873149da73..4575f5ba650 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_linalg_setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_linalg_setup.py.35.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- numpy/linalg/setup.py.orig
+++ numpy/linalg/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,6 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +64,7 @@
</span> sources=['lapack_litemodule.c', get_lapack_lite_sources],
depends=['lapack_lite/f2c.h'],
extra_info=lapack_info,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,11 +8,11 @@
</span> )
# umath_linalg module
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,6 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +74,7 @@
</span> depends=['lapack_lite/f2c.h'],
extra_info=lapack_info,
libraries=['npymath'],
+ extra_link_args=['-Wl,-undefined,dynamic_lookup', '-bundle']
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_data_files('*.pyi')
</span> return config
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_linalg_setup.py.diff b/python/py-numpy/files/patch-numpy_linalg_setup.py.36.diff
</span>similarity index 87%
copy from python/py-numpy/files/patch-numpy_linalg_setup.py.diff
copy to python/py-numpy/files/patch-numpy_linalg_setup.py.36.diff
<span style='display:block; white-space:pre;color:#808080;'>index 2873149da73..4575f5ba650 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_linalg_setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_linalg_setup.py.36.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- numpy/linalg/setup.py.orig
+++ numpy/linalg/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,6 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +64,7 @@
</span> sources=['lapack_litemodule.c', get_lapack_lite_sources],
depends=['lapack_lite/f2c.h'],
extra_info=lapack_info,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,11 +8,11 @@
</span> )
# umath_linalg module
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,6 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +74,7 @@
</span> depends=['lapack_lite/f2c.h'],
extra_info=lapack_info,
libraries=['npymath'],
+ extra_link_args=['-Wl,-undefined,dynamic_lookup', '-bundle']
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_data_files('*.pyi')
</span> return config
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_linalg_setup.py.diff b/python/py-numpy/files/patch-numpy_linalg_setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2873149da73..4575f5ba650 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-numpy_linalg_setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-numpy_linalg_setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- numpy/linalg/setup.py.orig
+++ numpy/linalg/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,6 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +64,7 @@
</span> sources=['lapack_litemodule.c', get_lapack_lite_sources],
depends=['lapack_lite/f2c.h'],
extra_info=lapack_info,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,11 +8,11 @@
</span> )
# umath_linalg module
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,6 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,6 +74,7 @@
</span> depends=['lapack_lite/f2c.h'],
extra_info=lapack_info,
libraries=['npymath'],
+ extra_link_args=['-Wl,-undefined,dynamic_lookup', '-bundle']
)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_data_files('*.pyi')
</span> return config
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.35.diff b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.35.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..600ededf5f0
</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.35.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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.36.diff b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.36.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6cf3e4e02f8
</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.36.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;'>+@@ -29,7 +29,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>