From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1399918-garchives=archives.gentoo.org@lists.gentoo.org>
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))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D0F9C158090
for <garchives@archives.gentoo.org>; Mon, 23 May 2022 08:33:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C1D49E07DB;
Mon, 23 May 2022 08:33:26 +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 A6DC6E07DB
for <gentoo-commits@lists.gentoo.org>; Mon, 23 May 2022 08:33:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 85BF0341507
for <gentoo-commits@lists.gentoo.org>; Mon, 23 May 2022 08:33:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E93EE463
for <gentoo-commits@lists.gentoo.org>; Mon, 23 May 2022 08:33:23 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1653294801.aba288aeb986c522c606de433288da3bd1ecb1a7.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/files/, dev-python/numpy/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/numpy/files/numpy-1.22.4-py311.patch dev-python/numpy/numpy-1.22.4.ebuild
X-VCS-Directories: dev-python/numpy/ dev-python/numpy/files/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: aba288aeb986c522c606de433288da3bd1ecb1a7
X-VCS-Branch: master
Date: Mon, 23 May 2022 08:33:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 7f501ad0-4c6b-43b0-90a0-833d8c21e0c9
X-Archives-Hash: ec56d84c761c698c86379ca78168c91f
commit: aba288aeb986c522c606de433288da3bd1ecb1a7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 08:10:50 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 23 08:33:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba288ae
dev-python/numpy: Enable py3.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/numpy/files/numpy-1.22.4-py311.patch | 31 +++++++++++++++++++++++++
dev-python/numpy/numpy-1.22.4.ebuild | 10 ++++++--
2 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/dev-python/numpy/files/numpy-1.22.4-py311.patch b/dev-python/numpy/files/numpy-1.22.4-py311.patch
new file mode 100644
index 000000000000..7af6431a5892
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.22.4-py311.patch
@@ -0,0 +1,31 @@
+From 42f3203a45231b338cf1a4c77fe81ca4b7fef4ef Mon Sep 17 00:00:00 2001
+From: Bas van Beek <43369155+BvB93@users.noreply.github.com>
+Date: Fri, 20 May 2022 02:42:37 +0200
+Subject: [PATCH] TST,TYP: Fix a python 3.11 failure for the `GenericAlias`
+ tests
+
+---
+ numpy/typing/tests/test_generic_alias.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/numpy/typing/tests/test_generic_alias.py b/numpy/typing/tests/test_generic_alias.py
+index 52d3deae4..267230a95 100644
+--- a/numpy/typing/tests/test_generic_alias.py
++++ b/numpy/typing/tests/test_generic_alias.py
+@@ -20,11 +20,11 @@
+ if sys.version_info >= (3, 9):
+ DType_ref = types.GenericAlias(np.dtype, (ScalarType,))
+ NDArray_ref = types.GenericAlias(np.ndarray, (Any, DType_ref))
+- FuncType = Callable[[Union[_GenericAlias, types.GenericAlias]], Any]
++ FuncType = Callable[["_GenericAlias | types.GenericAlias"], Any]
+ else:
+ DType_ref = Any
+ NDArray_ref = Any
+- FuncType = Callable[[_GenericAlias], Any]
++ FuncType = Callable[["_GenericAlias"], Any]
+
+ GETATTR_NAMES = sorted(set(dir(np.ndarray)) - _GenericAlias._ATTR_EXCEPTIONS)
+
+--
+2.35.1
+
diff --git a/dev-python/numpy/numpy-1.22.4.ebuild b/dev-python/numpy/numpy-1.22.4.ebuild
index f3f3c53c5eb8..4797c2585d6c 100644
--- a/dev-python/numpy/numpy-1.22.4.ebuild
+++ b/dev-python/numpy/numpy-1.22.4.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE="threads(+)"
FORTRAN_NEEDED=lapack
@@ -46,7 +46,8 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-1.22.0-no-hardcode-blasv2.patch
+ "${FILESDIR}"/numpy-1.22.0-no-hardcode-blasv2.patch
+ "${FILESDIR}"/numpy-1.22.4-py311.patch
)
distutils_enable_tests pytest
@@ -152,6 +153,11 @@ python_test() {
)
fi
+ [[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
+ # known problem
+ 'numpy/typing/tests/test_generic_alias.py::TestGenericAlias::test_pass[__dir__-<lambda>]'
+ )
+
distutils_install_for_testing --single-version-externally-managed \
--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}