<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b74c1cdfab08755c554d597a7d2b0fd739b955e6">https://github.com/macports/macports-ports/commit/b74c1cdfab08755c554d597a7d2b0fd739b955e6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b74c1cdfab08755c554d597a7d2b0fd739b955e6
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Dec 10 14:31:04 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-scipy: drop py3{5-7} subports
</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/67261
</span>---
python/py-scipy/Portfile | 65 +++-------------------
python/py-scipy/files/patch-allow-MP-boost.37.diff | 48 ----------------
.../files/patch-use__STDC_NO_THREADS__.37.diff | 54 ------------------
3 files changed, 7 insertions(+), 160 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 66ed1f64a3c..a66766969bd 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;'>@@ -21,7 +21,7 @@ long_description {*}${description}
</span>
homepage https://www.scipy.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 35 36 37 38 39 310 311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 38 39 310 311
</span>
python.add_archflags no
universal_variant no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,37 +54,9 @@ if {${name} ne ${subport}} {
</span> patchfiles-append patch-xcode12-fixes.27.diff
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${python.version} == 35} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup scipy scipy 1.4.1 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 e232695a51ed02b362187ea164ce269cb431e2ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4cc4e820d0770225bfb83e2a0ae340bb230fafb5402ea8efa87c6576a3f342cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18892400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://github.com/scipy/scipy/tree/maintenance/1.4.x/doc/release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {title="(1\.4\.[0-9.-]+)-notes.rst"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/60520
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compilers.allow_arguments_mismatch yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${python.version} == 36} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup scipy scipy 1.5.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 9668f24955efe3e955a462459369162895fff936 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 91366228947f17c97c422fafac4e5e6cc217e3732716ed2e75757d822c427829 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 19838989
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://github.com/scipy/scipy/tree/maintenance/1.5.x/doc/release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {title="(1\.5\.[0-9.-]+)-notes.rst"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See https://trac.macports.org/ticket/60520
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compilers.allow_arguments_mismatch yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Python 3.7 and newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Python 3.8 and newer
</span> PortGroup legacysupport 1.1
# __sincos https://trac.macports.org/ticket/63233
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -107,36 +79,13 @@ if {${name} ne ${subport}} {
</span>
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${python.version} == 37} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost.version 1.71
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-allow-MP-boost.37.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__.37.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost.version 1.76
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url https://github.com/scipy/scipy/tree/maintenance/1.7.x/doc/release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex {title="(1\.7\.[0-9.-]+)-notes.rst"}
</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:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost.version 1.76
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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> }
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.37.diff b/python/py-scipy/files/patch-allow-MP-boost.37.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e6962af7c3c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/files/patch-allow-MP-boost.37.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/_lib/setup.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/_lib/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,9 +5,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def check_boost_submodule():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from scipy._lib._boost_utils import _boost_dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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:#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><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:#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><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 build_clib_pre_build_hook(cmd, ext):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/files/patch-use__STDC_NO_THREADS__.37.diff b/python/py-scipy/files/patch-use__STDC_NO_THREADS__.37.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6e8e3080f34..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/files/patch-use__STDC_NO_THREADS__.37.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,54 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/integrate/setup.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/integrate/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,9 +37,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_library('mach', sources=mach_src, config_fc={'noopt': (__file__, 1)},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _pre_build_hook=pre_build_hook)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_library('quadpack', sources=quadpack_src, _pre_build_hook=pre_build_hook)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- config.add_library('lsoda', sources=lsoda_src, _pre_build_hook=pre_build_hook)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- config.add_library('vode', sources=vode_src, _pre_build_hook=pre_build_hook)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- config.add_library('dop', sources=dop_src, _pre_build_hook=pre_build_hook)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ config.add_library('lsoda', sources=lsoda_src, _pre_build_hook=pre_build_hook, macros=[('__STDC_NO_THREADS__',1)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ config.add_library('vode', sources=vode_src, _pre_build_hook=pre_build_hook, macros=[('__STDC_NO_THREADS__',1)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ config.add_library('dop', sources=dop_src, _pre_build_hook=pre_build_hook, macros=[('__STDC_NO_THREADS__',1)])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extensions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # quadpack:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/linalg/setup.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/linalg/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_extension('_flapack',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources=sources,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends=depends,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- extra_info=lapack_opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extra_info=lapack_opt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ define_macros=[('__STDC_NO_THREADS__',1)]
</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 uses_blas64():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,7 +97,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext = config.add_extension('_interpolative',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources=[join('src', 'id_dist', 'src', '*.f'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "interpolative.pyf"],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- extra_info=lapack_opt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extra_info=lapack_opt,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ define_macros=[('__STDC_NO_THREADS__',1)]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext._pre_build_hook = gfortran_legacy_flag_hook
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scipy/optimize/setup.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scipy/optimize/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,10 +78,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends=[join('tnc', 'tnc.h')],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **numpy_nodepr_api)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ local_macros = numpy_nodepr_api
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ local_macros['define_macros'].append(('__STDC_NO_THREADS__',1))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_extension('_cobyla',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources=[join('cobyla', x) for x in [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'cobyla.pyf', 'cobyla2.f', 'trstlp.f']],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- **numpy_nodepr_api)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ **local_macros)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sources = ['minpack2.pyf', 'dcsrch.f', 'dcstep.f']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.add_extension('minpack2',
</span></pre><pre style='margin:0'>
</pre>