From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 849A2158086 for ; Fri, 5 Nov 2021 10:10:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36BD8E0845; Fri, 5 Nov 2021 10:10:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97D62E08C3 for ; Fri, 5 Nov 2021 10:10:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 208F3342D61 for ; Fri, 5 Nov 2021 05:56:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2841083 for ; Fri, 5 Nov 2021 05:56:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1636091808.d1291d92a0979e9227bbd81d4db6076ea08dddef.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/files/, dev-python/scipy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/scipy/files/scipy-1.7.1-pythran-tests-32-bit.patch dev-python/scipy/scipy-1.7.1-r1.ebuild dev-python/scipy/scipy-1.7.1.ebuild X-VCS-Directories: dev-python/scipy/files/ dev-python/scipy/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d1291d92a0979e9227bbd81d4db6076ea08dddef X-VCS-Branch: master Date: Fri, 5 Nov 2021 05:56:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a32376eb-d27a-4e71-9c24-cafc21a3182e X-Archives-Hash: 72fea7447739dabdbf7e31a01f881625 commit: d1291d92a0979e9227bbd81d4db6076ea08dddef Author: Sam James gentoo org> AuthorDate: Fri Nov 5 05:43:30 2021 +0000 Commit: Sam James gentoo 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 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 +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