<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bf5220f80bbf0db316be449e20c96b86321a57c6">https://github.com/macports/macports-ports/commit/bf5220f80bbf0db316be449e20c96b86321a57c6</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 bf5220f80bb py-scikit-umfpack: update scikit-umfpack to 0.4.0
</span>bf5220f80bb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bf5220f80bbf0db316be449e20c96b86321a57c6
</span>Author: Jonathan Stickel <jjstickel@gmail.com>
AuthorDate: Mon Nov 20 08:39:17 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> py-scikit-umfpack: update scikit-umfpack to 0.4.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update scikit-umfpack to 0.4.0
</span><span style='display:block; white-space:pre;color:#404040;'> * change to pypi for download
</span><span style='display:block; white-space:pre;color:#404040;'> * add patchfile from upstream master (can be removed in 0.4.1)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/21451#issuecomment-1819126271
</span>---
python/py-scikit-umfpack/Portfile | 21 ++++++++----
.../019c5b3f93a7e7c8d2037ecd0323e8f50278bf44.patch | 39 ++++++++++++++++++++++
2 files changed, 53 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikit-umfpack/Portfile b/python/py-scikit-umfpack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f9ec66b9f4..b9ee9c81d31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scikit-umfpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scikit-umfpack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,12 +2,11 @@
</span>
PortSystem 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup scikit-umfpack scikit-umfpack 0.3.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from archive
</span> name py-scikit-umfpack
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.4.0
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+python.rootname scikit-umfpack
</span>
categories-append math
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,19 +14,27 @@ maintainers {gmail.com:jjstickel @jjstickel} openmaintainer
</span>
description scikit-umfpack provides wrapper of UMFPACK sparse direct solver to SciPy.
long_description ${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://pypi.org/project/scikit-umfpack/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 063300abccbbd5b6ecc01deb1c48b6db0c3ba1fe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 88d2f3f4c74f4b7a11df5a884a97e6fb59b24ea0fa5416cb470d108a683a3691 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 30734
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname scikit_umfpack-${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 39 310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b5b2de0e89a114c66b943b6ebc61a55e96d99363 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 70989c2fa70c81b9e2e698f7bc87bcbec90df124f77883b4925400dc4bb58630 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 30720
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 39 310 311
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # clang fix, will be included in version 0.4.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles 019c5b3f93a7e7c8d2037ecd0323e8f50278bf44.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:py${python.version}-setuptools \
port:swig-python
depends_lib-append \
port:py${python.version}-scipy \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-meson-python \
</span> port:SuiteSparse_UMFPACK
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scikit-umfpack/files/019c5b3f93a7e7c8d2037ecd0323e8f50278bf44.patch b/python/py-scikit-umfpack/files/019c5b3f93a7e7c8d2037ecd0323e8f50278bf44.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f8d09f3fb8e
</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-scikit-umfpack/files/019c5b3f93a7e7c8d2037ecd0323e8f50278bf44.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/scikits/umfpack/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scikits/umfpack/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,12 +14,30 @@ swig_inc_args = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach _dir : suitesparse_incdirs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ swig_inc_args += '-I' + _dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# This is a hack that gets at the location for conda envs, when building with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# conda compilers. We need proper SWIG support for this to become more robust,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# see https://github.com/mesonbuild/meson/issues/341.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_cc_incdir = run_command([cc, '-print-sysroot'], check: true).stdout().strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if _cc_incdir.contains('bin/../')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- swig_inc_args += '-I' + _cc_incdir.split('bin/../')[0] / 'include'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# This is a hack that gets at the location for conda envs (and perhaps other
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# types of envs), when building with conda compilers. We need proper SWIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# support for this to become more robust, see
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# https://github.com/mesonbuild/meson/issues/341.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if cc.get_id() == 'gcc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _cc_sysroot = run_command([cc, '-print-sysroot'], check: true).stdout().strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if _cc_sysroot.contains('bin/../')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _incdir = _cc_sysroot.split('bin/../')[0] / 'include'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if fs.exists(_incdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ swig_inc_args += '-I' + _incdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elif cc.get_id() == 'clang'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _clang_v = run_command([cc, '-v'], check: true).stderr().strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if _clang_v.contains('InstalledDir: ')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _bindir = _clang_v.split('InstalledDir: ')[1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if fs.exists(_bindir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _incdir = _bindir / '../include'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if fs.exists(_incdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ swig_inc_args += '-I' + _incdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The above took care of all fixed directories. We also need the default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # compiler search directories, but Meson doesn't expose those.
</span></pre><pre style='margin:0'>
</pre>