[gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/files/, dev-python/scipy/

[Sam James]

commit:     d1291d92a0979e9227bbd81d4db6076ea08dddef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  5 05:43:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov  5 05:56:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1291d92

dev-python/scipy: add upstream fix for 32-bit test failures (pythran)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/scipy-1.7.1-pythran-tests-32-bit.patch   | 31 ++++++++++++++++++++++
 .../{scipy-1.7.1.ebuild => scipy-1.7.1-r1.ebuild}  |  4 +++
 2 files changed, 35 insertions(+)

diff --git a/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch b/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch
new file mode 100644
index 00000000000..206d1d9fa3b
--- /dev/null
+++ b/dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch
@@ -0,0 +1,31 @@
+https://github.com/scipy/scipy/commit/5b3a3b440525aa5038e2cead1f9b4f23a610cd9f
+
+From: serge-sans-paille <serge.guelton@××××××××××××××××.eu>
+Date: Sun, 18 Jul 2021 11:14:29 +0200
+Subject: [PATCH] Extra pythran annotation for i686 support
+
+Bug spotted on Fedora, see https://src.fedoraproject.org/rpms/scipy/pull-request/22
+
+The `int[::]` annotation is used to accept non-contiguous views.
+--- a/scipy/optimize/_group_columns.py
++++ b/scipy/optimize/_group_columns.py
+@@ -54,6 +54,8 @@ def group_dense(m, n, A):
+ 
+ #pythran export group_sparse(int, int, intc[], intc[])
+ #pythran export group_sparse(int, int, int[], int[])
++#pythran export group_sparse(int, int, intc[::], intc[::])
++#pythran export group_sparse(int, int, int[::], int[::])
+ def group_sparse(m, n, indices, indptr):
+     groups = -np.ones(n, dtype=np.intp)
+     current_group = 0
+--- a/scipy/signal/_max_len_seq_inner.py
++++ b/scipy/signal/_max_len_seq_inner.py
+@@ -4,6 +4,7 @@
+ import numpy as np
+ 
+ #pythran export _max_len_seq_inner(intp[], int8[], int, int, int8[])
++#pythran export _max_len_seq_inner(int[], int8[], int, int, int8[])
+ 
+ # Fast inner loop of max_len_seq.
+ def _max_len_seq_inner(taps, state, nbits, length, seq):
+

diff --git a/dev-python/scipy/scipy-1.7.1.ebuild b/dev-python/scipy/scipy-1.7.1-r1.ebuild
similarity index 98%
rename from dev-python/scipy/scipy-1.7.1.ebuild
rename to dev-python/scipy/scipy-1.7.1-r1.ebuild
index ed5e007e4e2..0ef732f5b19 100644
--- a/dev-python/scipy/scipy-1.7.1.ebuild
+++ b/dev-python/scipy/scipy-1.7.1-r1.ebuild
@@ -47,6 +47,10 @@ DISTUTILS_IN_SOURCE_BUILD=1
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pythran-tests-32-bit.patch
+)
+
 src_unpack() {
 	default
 	if use doc; then