<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/248cc171298722674c508c5790bdeb900a9069b5">https://github.com/macports/macports-ports/commit/248cc171298722674c508c5790bdeb900a9069b5</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 248cc171298 py-scipy: update to 1.9.0
</span>248cc171298 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 248cc171298722674c508c5790bdeb900a9069b5
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Aug 16 08:53:42 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-scipy: update to 1.9.0
</span>---
python/py-scipy/Portfile | 8 ++---
python/py-scipy/files/patch-allow-MP-boost.diff | 39 ++--------------------
.../files/patch-use__STDC_NO_THREADS__.diff | 6 ++--
3 files changed, 10 insertions(+), 43 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 64e9b6b8489..24a27ae7ce4 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.8.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a69c9f679bd13916d59098adacc2d853ad8bafdd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9e3fb1b0e896f14a85aa9a28d5f755daaeeb54c897b746df7a55ccb02b340f33 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 38196215
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup scipy scipy 1.9.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 31bdcdfaec77849d1f455926e68d17e26f1b2ed2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c0dfd7d2429452e7e94904c6a3af63cbaa3cf51b348bd9d35b42db7e9ad42791 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 42016757
</span> revision 0
name py-scipy
<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 9907e16ffb2..193953bec9c 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;'>@@ -1,48 +1,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/_lib/_boost_utils.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/_lib/_boost_utils.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,10 +1,29 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '''Helper functions to get location of header files.'''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import pathlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from typing import Union
</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;'>- def _boost_dir(ret_path: bool = False) -> Union[pathlib.Path, str]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '''Directory where root Boost/ directory lives.'''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # 1: see if the submodule is in use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p = pathlib.Path(__file__).parent / 'boost'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return p if ret_path else str(p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if os.path.exists(p / 'README.md'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return p
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # 2: from a shell environment variable, in order of checking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # these are the top-level PREFIX for where Boost is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # such that `include/boost` and `lib` are subdirectories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p_env = ['BOOST_ROOT', 'BOOST_DIR', 'BOOSTROOT', 'BOOSTDIR']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for t_p in p_env:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print('checking for shell enviroment variable', t_p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ t_p_v = os.getenv(t_p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print('value is', t_p_v)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if t_p_v is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if os.path.exists(pathlib.Path(t_p_v) / 'include' / 'boost'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print('path exists; returning this Boost path')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return t_p_v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Boost not found!!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ raise RuntimeError("Missing the `boost` submodule! Run `git submodule "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "update --init` to fix this.")
</span> --- scipy/_lib/setup.py.orig
+++ scipy/_lib/setup.py
@@ -4,9 +4,9 @@
def check_boost_submodule():
from scipy._lib._boost_utils import _boost_dir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if not os.path.exists(_boost_dir(ret_path=True) / 'README.md'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if not os.path.exists(_boost_dir(ret_path=True) / 'README.rst'):
</span> - raise RuntimeError("Missing the `boost` submodule! Run `git submodule "
- "update --init` to fix this.")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if not os.path.exists(_boost_dir(ret_path=True) / 'README.md'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if not os.path.exists(_boost_dir(ret_path=True) / 'README.rst'):
</span> + # raise RuntimeError("Missing the `boost` submodule! Run `git submodule "
+ # "update --init` to fix this.")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- def build_clib_pre_build_hook(cmd, ext):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def check_highs_submodule():
</span><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 81ff99eb326..44902258fca 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;'>-@@ -60,7 +60,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,7 +57,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;'>-@@ -97,7 +98,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,7 +95,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;'>@@ -37,7 +37,7 @@
</span>
--- scipy/optimize/setup.py.orig
+++ scipy/optimize/setup.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,10 +78,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,10 +79,13 @@
</span> depends=[join('tnc', 'tnc.h')],
**numpy_nodepr_api)
</pre><pre style='margin:0'>
</pre>