<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/a2c18afb17e85e35bdb6cd0f803c5fa2dbbea855">https://github.com/macports/macports-ports/commit/a2c18afb17e85e35bdb6cd0f803c5fa2dbbea855</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 a2c18afb17e py-scipy: update to 1.8.0
</span>a2c18afb17e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a2c18afb17e85e35bdb6cd0f803c5fa2dbbea855
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Feb 6 13:52:43 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-scipy: update to 1.8.0
</span>---
python/py-scipy/Portfile | 43 +++++++++++++++-------
...-MP-boost.diff => patch-allow-MP-boost.37.diff} | 0
python/py-scipy/files/patch-allow-MP-boost.diff | 2 +-
..._.diff => patch-use__STDC_NO_THREADS__.37.diff} | 0
.../files/patch-use__STDC_NO_THREADS__.diff | 18 +++++++--
5 files changed, 46 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/Portfile b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d4804cd8245..7d0cfd154bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,10 +7,10 @@ PortGroup github 1.0
</span> PortGroup compilers 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup scipy scipy 1.7.3 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fed96617a5baeaa41571fd0ea39b68091d897bab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 36102562
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup scipy scipy 1.8.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6305a22277c5732a98c7f544d42c48a3513eb520 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 31d4f2d6b724bc9a98e527b5849b8a7e589bf1ea630c33aa563eda912c9ff0bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 38313602
</span> revision 0
name py-scipy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +85,8 @@ if {${name} ne ${subport}} {
</span>
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python 3.7 and newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup legacysupport 1.1
</span>
# __sincos https://trac.macports.org/ticket/63233
legacysupport.newest_darwin_requires_legacy 12
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,14 +94,8 @@ if {${name} ne ${subport}} {
</span> # current release, which uses Boost
PortGroup boost 1.0
boost.version 1.71
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-allow-MP-boost.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # force disable STDC THREADS from <threads.h> and instead just use __thread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/62488
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-use__STDC_NO_THREADS__.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pythran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:py${python.version}-pythran
</span> depends_lib-append port:py${python.version}-mypy
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,9 +105,31 @@ if {${name} ne ${subport}} {
</span> # https://build.macports.org/builders/ports-10.11_x86_64-builder/builds/136856/steps/install-port/logs/stdio
compiler.blacklist-append {clang < 900}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # add this next release
</span> github.tarball_from releases
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${python.version} == 37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup scipy scipy 1.7.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 fed96617a5baeaa41571fd0ea39b68091d897bab \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ab5875facfdef77e0a47d5fd39ea178b58e60e454a4c85aa1e52fcb80db7babf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 36102562
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-allow-MP-boost.37.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force disable STDC THREADS from <threads.h> and instead just use __thread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/62488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-use__STDC_NO_THREADS__.37.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-allow-MP-boost.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force disable STDC THREADS from <threads.h> and instead just use __thread
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/62488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-use__STDC_NO_THREADS__.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
depends_lib-append port:py${python.version}-numpy \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/files/patch-allow-MP-boost.diff b/python/py-scipy/files/patch-allow-MP-boost.37.diff
</span>similarity index 100%
copy from python/py-scipy/files/patch-allow-MP-boost.diff
copy to python/py-scipy/files/patch-allow-MP-boost.37.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/files/patch-allow-MP-boost.diff b/python/py-scipy/files/patch-allow-MP-boost.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e6962af7c3c..9907e16ffb2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/files/patch-allow-MP-boost.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scipy/files/patch-allow-MP-boost.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@
</span> + "update --init` to fix this.")
--- scipy/_lib/setup.py.orig
+++ scipy/_lib/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,9 +5,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,9 +4,9 @@
</span> def check_boost_submodule():
from scipy._lib._boost_utils import _boost_dir
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/files/patch-use__STDC_NO_THREADS__.diff b/python/py-scipy/files/patch-use__STDC_NO_THREADS__.37.diff
</span>similarity index 100%
copy from python/py-scipy/files/patch-use__STDC_NO_THREADS__.diff
copy to python/py-scipy/files/patch-use__STDC_NO_THREADS__.37.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/files/patch-use__STDC_NO_THREADS__.diff b/python/py-scipy/files/patch-use__STDC_NO_THREADS__.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6e8e3080f34..81ff99eb326 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/files/patch-use__STDC_NO_THREADS__.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scipy/files/patch-use__STDC_NO_THREADS__.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@
</span> # quadpack:
--- scipy/linalg/setup.py.orig
+++ scipy/linalg/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,8 @@
</span> config.add_extension('_flapack',
sources=sources,
depends=depends,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@
</span> )
if uses_blas64():
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,7 +97,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +98,8 @@
</span> ext = config.add_extension('_interpolative',
sources=[join('src', 'id_dist', 'src', '*.f'),
"interpolative.pyf"],
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,4 +51,16 @@
</span> + **local_macros)
sources = ['minpack2.pyf', 'dcsrch.f', 'dcstep.f']
<span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_extension('minpack2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.add_extension('_minpack2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scipy/sparse/linalg/_propack/setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scipy/sparse/linalg/_propack/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_info=lapack_opt,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ undef_macros=['_OPENMP'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f2py_options=f2py_options,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- depends=['setup.py'] + src)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ depends=['setup.py'] + src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ define_macros=[('__STDC_NO_THREADS__',1)])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext._pre_build_hook = pre_build_hook
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return config
</span></pre><pre style='margin:0'>
</pre>