From: "Artemis Everfree" <artemis@artemis.sh>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-sound/corrscope/, media-sound/corrscope/files/
Date: Wed, 24 Jul 2024 10:48:34 +0000 (UTC) [thread overview]
Message-ID: <1721818080.9c6033ea9ce9c769e9f4a5e23d9919a7a438cf04.artemis@gentoo> (raw)
commit: 9c6033ea9ce9c769e9f4a5e23d9919a7a438cf04
Author: Artemis Everfree <artemis <AT> artemis <DOT> sh>
AuthorDate: Wed Jul 24 10:45:28 2024 +0000
Commit: Artemis Everfree <artemis <AT> artemis <DOT> sh>
CommitDate: Wed Jul 24 10:48:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9c6033ea
media-sound/corrscope: fix for numpy 2.x
Signed-off-by: Artemis Everfree <artemis <AT> artemis.sh>
.../{corrscope-0.10.0.ebuild => corrscope-0.10.0-r1.ebuild} | 7 ++++++-
media-sound/corrscope/files/remove-npdeprecate.patch | 12 ++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/media-sound/corrscope/corrscope-0.10.0.ebuild b/media-sound/corrscope/corrscope-0.10.0-r1.ebuild
similarity index 80%
rename from media-sound/corrscope/corrscope-0.10.0.ebuild
rename to media-sound/corrscope/corrscope-0.10.0-r1.ebuild
index ff81597e0..ea666260a 100644
--- a/media-sound/corrscope/corrscope-0.10.0.ebuild
+++ b/media-sound/corrscope/corrscope-0.10.0-r1.ebuild
@@ -4,7 +4,7 @@ EAPI=8
DISTUTILS_USE_PEP517=poetry
DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit distutils-r1 pypi
@@ -42,4 +42,9 @@ PATCHES=(
# Ideally, we should upstream a fix that only conditionally imports it,
# but I don't know how to do that right now.
"${FILESDIR}"/remove-appnope-dep.patch
+
+ # corrscope seems to have copied in a modified scipy file to their source
+ # tree. That file uses np.deprecate, which is removed in numpy2. corrscope
+ # doesn't care about this function being marked deprecated, so neither do we
+ "${FILESDIR}"/remove-npdeprecate.patch
)
diff --git a/media-sound/corrscope/files/remove-npdeprecate.patch b/media-sound/corrscope/files/remove-npdeprecate.patch
new file mode 100644
index 000000000..b165131e3
--- /dev/null
+++ b/media-sound/corrscope/files/remove-npdeprecate.patch
@@ -0,0 +1,12 @@
+diff --git a/corrscope/utils/scipy/windows.py b/corrscope/utils/scipy/windows.py
+index 0eee7f2..8ba1fa4 100644
+--- a/corrscope/utils/scipy/windows.py
++++ b/corrscope/utils/scipy/windows.py
+@@ -816,7 +816,6 @@ def hann(M: int, sym: bool = True) -> np.ndarray:
+ return general_hamming(M, 0.5, sym)
+
+
+-@np.deprecate(new_name='scipy.signal.windows.hann')
+ def hanning(*args, **kwargs):
+ return hann(*args, **kwargs)
+
next reply other threads:[~2024-07-24 10:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-24 10:48 Artemis Everfree [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-19 22:02 [gentoo-commits] repo/proj/guru:dev commit in: media-sound/corrscope/, media-sound/corrscope/files/ Artemis Everfree
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1721818080.9c6033ea9ce9c769e9f4a5e23d9919a7a438cf04.artemis@gentoo \
--to=artemis@artemis.sh \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox