<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/5f125f4af6dec2d99ec1749a1cb34a83ab4a3acd">https://github.com/macports/macports-ports/commit/5f125f4af6dec2d99ec1749a1cb34a83ab4a3acd</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 5f125f4af6d py-numpy: update to 1.22.0
</span>5f125f4af6d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5f125f4af6dec2d99ec1749a1cb34a83ab4a3acd
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sat Jan 1 19:40:31 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-numpy: update to 1.22.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Pin py37-numpy at 1.21.X
</span>---
python/py-numpy/Portfile | 19 ++++++++++++++-----
.../{patch-arm64_min.diff => patch-arm64_min.37.diff} | 0
python/py-numpy/files/patch-arm64_min.diff | 2 +-
...fcompiler_g95.diff => patch-fcompiler_g95.37.diff} | 0
python/py-numpy/files/patch-fcompiler_g95.diff | 12 ++++++------
...etup.py.diff => patch-numpy_core_setup.py.37.diff} | 0
python/py-numpy/files/patch-numpy_core_setup.py.diff | 4 ++--
...up.py.diff => patch-numpy_linalg_setup.py.37.diff} | 0
.../py-numpy/files/patch-numpy_linalg_setup.py.diff | 4 ++--
.../files/patch-numpy_tests_test_scripts.py.37.diff | 11 +++++++++++
10 files changed, 36 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 d05696662ba..073be8f9190 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;'>@@ -14,11 +14,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.21.5 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5f8dc27842bb11ae7652963f080dbb24f0e37d3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1a7ee0ffb35dc7489aebe5185a483f4c43b0d2cf784c3c9940f975a7dde56506 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9770548
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup numpy numpy 1.22.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 13fc81b3a2ac2922c1aa964394a996f5242b54ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f2be14ba396780a6f662b8ba1a24466c9cf18a6a386174f614668e58387a13d7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10362528
</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;'>@@ -80,6 +80,15 @@ if {${name} ne ${subport}} {
</span> set PATCH_PY_EXT ".36"
livecheck.url https://numpy.org/doc/stable/release.html
livecheck.regex {(1\.19(?:\.\d+)+)}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${python.version} == 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup numpy numpy 1.21.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5f8dc27842bb11ae7652963f080dbb24f0e37d3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1a7ee0ffb35dc7489aebe5185a483f4c43b0d2cf784c3c9940f975a7dde56506 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9770548
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set PATCH_PY_EXT ".37"
</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\.21(?:\.\d+)+)}
</span> } else {
github.tarball_from releases
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-arm64_min.diff b/python/py-numpy/files/patch-arm64_min.37.diff
</span>similarity index 100%
copy from python/py-numpy/files/patch-arm64_min.diff
copy to python/py-numpy/files/patch-arm64_min.37.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-arm64_min.diff b/python/py-numpy/files/patch-arm64_min.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 76972cdbf3d..af59915ae46 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/files/patch-arm64_min.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/files/patch-arm64_min.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- numpy/distutils/system_info.py.orig
+++ numpy/distutils/system_info.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2473,25 +2473,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2524,25 +2524,33 @@
</span> # Use the system BLAS from Accelerate or vecLib under OSX
args = []
link_args = []
<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.37.diff
</span>similarity index 100%
copy from python/py-numpy/files/patch-fcompiler_g95.diff
copy to python/py-numpy/files/patch-fcompiler_g95.37.diff
<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 1d8a98d90c1..f394e1520fd 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,11 +1,11 @@
</span> --- numpy/distutils/fcompiler/__init__.py.orig
+++ numpy/distutils/fcompiler/__init__.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -745,7 +745,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('cygwin.*', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95')),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('linux.*', ('gnu95', 'intel', 'lahey', 'pg', 'nv', 'absoft', 'nag', 'vast', 'compaq',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'intele', 'intelem', 'gnu', 'g95', 'pathf95', 'nagfor', 'fujitsu')),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'pg')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -747,7 +747,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'vast', 'compaq', 'intele', 'intelem', 'gnu', 'g95',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'pathf95', 'nagfor', 'fujitsu')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ('darwin.*', ('gnu95', 'nag', 'nagfor', 'absoft', 'ibm', 'intel', 'gnu',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'g95', 'pg')),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'pg')),
</span> ('sunos.*', ('sun', 'gnu', 'gnu95', 'g95')),
('irix.*', ('mips', 'gnu', 'gnu95',)),
('aix.*', ('ibm', 'gnu', 'gnu95',)),
<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.37.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.37.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 c3e29b3ef85..35ebccf324f 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;'>-@@ -483,7 +483,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -501,7 +501,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;'>-@@ -581,7 +588,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -599,7 +606,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_linalg_setup.py.diff b/python/py-numpy/files/patch-numpy_linalg_setup.py.37.diff
</span>similarity index 100%
copy from python/py-numpy/files/patch-numpy_linalg_setup.py.diff
copy to python/py-numpy/files/patch-numpy_linalg_setup.py.37.diff
<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 0a07f1128b8..1ef86118da8 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;'>-@@ -65,6 +65,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,7 +8,7 @@
</span> )
# umath_linalg module
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,6 +75,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'],
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/files/patch-numpy_tests_test_scripts.py.37.diff b/python/py-numpy/files/patch-numpy_tests_test_scripts.py.37.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.37.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>