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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A13A4158004 for ; Tue, 2 Jul 2024 06:59:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C95142BC048; Tue, 2 Jul 2024 06:59:00 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A59312BC048 for ; Tue, 2 Jul 2024 06:59:00 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 669A734306E for ; Tue, 2 Jul 2024 06:58:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 167F41DC2 for ; Tue, 2 Jul 2024 06:58:57 +0000 (UTC) From: "Michał Górny" 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" Message-ID: <1719903529.4010bd0e93aafb73979a5c5fc43510ebb7abb2f4.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/mpmath/, dev-python/mpmath/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/mpmath/Manifest dev-python/mpmath/files/mpmath-1.4.0_alpha1-numpy-2.patch dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild X-VCS-Directories: dev-python/mpmath/files/ dev-python/mpmath/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4010bd0e93aafb73979a5c5fc43510ebb7abb2f4 X-VCS-Branch: master Date: Tue, 2 Jul 2024 06:58: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: be5fa897-bfed-4dca-bc35-6ad0f7577adc X-Archives-Hash: 3d3d36ed4a74772ffb300e46010247dc commit: 4010bd0e93aafb73979a5c5fc43510ebb7abb2f4 Author: Michał Górny gentoo org> AuthorDate: Tue Jul 2 06:18:30 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jul 2 06:58:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4010bd0e dev-python/mpmath: Bump to 1.4.0_alpha1 Signed-off-by: Michał Górny gentoo.org> dev-python/mpmath/Manifest | 1 + .../mpmath/files/mpmath-1.4.0_alpha1-numpy-2.patch | 32 +++++++++++ dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild | 63 ++++++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest index c856f8ba229c..62f82da139aa 100644 --- a/dev-python/mpmath/Manifest +++ b/dev-python/mpmath/Manifest @@ -1 +1,2 @@ DIST mpmath-1.3.0.tar.gz 508106 BLAKE2B 9d4eebbbb6788dd3ee45c8c30068ef3512043dd09ab626cbaf69b0f6bdf057a6e8c53c34e3dda7627db923f0d536a0bebf83916d8942f4dde9546bb8e0046f33 SHA512 a68028150095d743eae9669a0f70cbe6b7bcb4d27dfad6b1a96575f0885ec7306459a2a464117bab18779883ee8b4293502b4bd0ebd8672767e1d08d38f8b202 +DIST mpmath-1.4.0a1.tar.gz 2063946 BLAKE2B 0c6a86b1c8dc9addc3eb82586d4c4182ae6a9318cbe45d4fc699b9fbf9539774ae30f11c2d50137a3aa16ed4b0c328990483c2ceea812f86751cfa3ce419de5c SHA512 260afb20faaa949b89054ced3b039e346086d47c6ea018c8d226a0c42d9aa8f792611fe709c894a0df6930a0703dc8cfcf814432eba7ac977a821effd8879903 diff --git a/dev-python/mpmath/files/mpmath-1.4.0_alpha1-numpy-2.patch b/dev-python/mpmath/files/mpmath-1.4.0_alpha1-numpy-2.patch new file mode 100644 index 000000000000..13b6ffc9a94f --- /dev/null +++ b/dev-python/mpmath/files/mpmath-1.4.0_alpha1-numpy-2.patch @@ -0,0 +1,32 @@ +From b80b0e08b75f41730a1116aebe34361e5d63d58c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Tue, 2 Jul 2024 08:11:58 +0200 +Subject: [PATCH] Fix the comparison in test_compatibility for NumPy 2.0.0 + +The comparison in `mpmath/tests/test_convert.py::test_compatibility` +failed for `np.float16` in NumPy 2.0.0 since `2.0**-53` cannot be +represented in half-precision floating point type. Convert the LHS +to `np.float64` to ensure that the comparison is done in sufficiently +precise type. + +This fixes the actual test failure from #815 but the deprecation warning +remains. +--- + mpmath/tests/test_convert.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/mpmath/tests/test_convert.py b/mpmath/tests/test_convert.py +index 5578b245..c6ef2187 100644 +--- a/mpmath/tests/test_convert.py ++++ b/mpmath/tests/test_convert.py +@@ -254,7 +254,9 @@ def test_compatibility(): + # Handle the weird types + try: diff = np.abs(type(np.sqrt(x))(sqrt(x)) - np.sqrt(x)) + except: continue +- assert diff < 2.0**-53 ++ # numpy-2 does the comparison on LHS type, so we need to convert ++ # it to a type that can actually represent 2.0**-53 ++ assert np.float64(diff) < 2.0**-53 + assert mpf(np.float64('inf')) == inf + assert isnan(mp.npconvert(np.float64('nan'))) + if hasattr(np, "float128"): diff --git a/dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild b/dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild new file mode 100644 index 000000000000..ef235883f25d --- /dev/null +++ b/dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( pypy3 python3_{10..13} ) + +inherit distutils-r1 optfeature pypi + +DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic" +HOMEPAGE=" + https://mpmath.org/ + https://github.com/mpmath/mpmath/ + https://pypi.org/project/mpmath/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +BDEPEND=" + dev-python/setuptools-scm[${PYTHON_USEDEP}] + test? ( + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/gmpy[${PYTHON_USEDEP}] + ' 'python3*') + $(python_gen_cond_dep ' + dev-python/ipython[${PYTHON_USEDEP}] + ' 3.{10..12}) + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +PATCHES=( + # https://github.com/mpmath/mpmath/pull/816 + "${FILESDIR}/${P}-numpy-2.patch" +) + +python_test() { + local EPYTEST_DESELECT=( + # TODO + mpmath/tests/test_cli.py::test_bare_console_bare_division + mpmath/tests/test_cli.py::test_bare_console_no_bare_division + mpmath/tests/test_cli.py::test_bare_console_pretty + mpmath/tests/test_cli.py::test_bare_console_without_ipython + mpmath/tests/test_cli.py::test_bare_console_wrap_floats + ) + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest -p rerunfailures --reruns=5 +} + +pkg_postinst() { + optfeature "gmp support" dev-python/gmpy + optfeature "matplotlib support" dev-python/matplotlib +}