From fbbf0ee3d56a6fd27adf182c6907dc745623aeaa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Aug 2024 11:05:14 +0100 Subject: gentoo auto-resync : 10:08:2024 - 11:05:14 --- dev-python/mpmath/Manifest | 3 +- .../mpmath/files/mpmath-1.4.0_alpha1-numpy-2.patch | 32 ---------------------- dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild | 9 +++--- 3 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 dev-python/mpmath/files/mpmath-1.4.0_alpha1-numpy-2.patch (limited to 'dev-python/mpmath') diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest index e5bbab109b81..cc66967d6288 100644 --- a/dev-python/mpmath/Manifest +++ b/dev-python/mpmath/Manifest @@ -1,6 +1,5 @@ -AUX mpmath-1.4.0_alpha1-numpy-2.patch 1394 BLAKE2B f36c132cb850fc4a9f13a1476d437e748d034cd0fe106589e10c5798fc9df3e53634576b58611846f839bfef8087f21442f3a0fa2bc7df204359cf83d14e6712 SHA512 01b172592d2540a60c7af0c99d54e1a52180187f787ded33b275127e929e7832576c2708865268635d16bae0429e406ae69aafa51e8f4ddc26299e9490a24d8e DIST mpmath-1.3.0.tar.gz 508106 BLAKE2B 9d4eebbbb6788dd3ee45c8c30068ef3512043dd09ab626cbaf69b0f6bdf057a6e8c53c34e3dda7627db923f0d536a0bebf83916d8942f4dde9546bb8e0046f33 SHA512 a68028150095d743eae9669a0f70cbe6b7bcb4d27dfad6b1a96575f0885ec7306459a2a464117bab18779883ee8b4293502b4bd0ebd8672767e1d08d38f8b202 DIST mpmath-1.4.0a1.tar.gz 2063946 BLAKE2B 0c6a86b1c8dc9addc3eb82586d4c4182ae6a9318cbe45d4fc699b9fbf9539774ae30f11c2d50137a3aa16ed4b0c328990483c2ceea812f86751cfa3ce419de5c SHA512 260afb20faaa949b89054ced3b039e346086d47c6ea018c8d226a0c42d9aa8f792611fe709c894a0df6930a0703dc8cfcf814432eba7ac977a821effd8879903 EBUILD mpmath-1.3.0-r1.ebuild 833 BLAKE2B 3004b8e19a4b18f01e3dc999ea0212b9d029a1cc4ec50c20c504e8af3b439d2404be00335800c7dc2efaa04d46cce4a6197ab02ea21ab8af9f08dff124a8a1c8 SHA512 781b0d48ab4198d72ae49bae04977fc3af1f294caff27685177308ad19cf82ae7a196c8ce14921cf3351aa1a2295bc1752a0458981228c9f96600a3c73bff45b -EBUILD mpmath-1.4.0_alpha1.ebuild 1624 BLAKE2B 39b22476d04d12f2edf481983bc4c290afe9c67cca34c0d119cce0230f7c613a47425018375526e0ba85e78118afd7f73cd05d8b6a84c2c3603aa8a0f5861bca SHA512 52824df6c1ba3e667ffff2090b4b7569f442e3cc19b29400987519c601c698f46ae99f84f2d11f5db50726db73dc21aaa455bb6e33f67faaed57a2c8a4ab3dd5 +EBUILD mpmath-1.4.0_alpha1.ebuild 1725 BLAKE2B 6ca3a81a3f786fd27df4f4b5519ffffb4e0490c95308f3710fd154e35ec35aa28b80423a0d3fb1ef2e67ec3e7251e76deb6100e3ecd4b16a6adf1dde7e901795 SHA512 fa805ab2d58e42144ba0bd2b32c29b11a5dc25604246ea5e14c29dc44289fed9368a8e76277cfb5a1f7173c3ecc27c459f028926bd9ffd718570586ffdd353de MISC metadata.xml 624 BLAKE2B 8526d1f6329f8cb4d2ee5a9ae73dc5bf3861adce5beaa6a0aaf5abb918de11ad1ab0c5c206331bd4eaeaa7bdeda0c6ea6a2007492825be0545caa121f41abd6c SHA512 dc4c6f5e82ce735e70bdc1bbfbc01f9c1d62c2d46c54a173287a59b90882aa09945da39bb41e7b28f6d0066851e2adf07f0b7033aa77cc5620491864e89f188e 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 deleted file mode 100644 index 13b6ffc9a94f..000000000000 --- a/dev-python/mpmath/files/mpmath-1.4.0_alpha1-numpy-2.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 index ef235883f25d..d1fb0d556ec1 100644 --- a/dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild +++ b/dev-python/mpmath/mpmath-1.4.0_alpha1.ebuild @@ -38,11 +38,6 @@ BDEPEND=" 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 @@ -51,6 +46,10 @@ python_test() { 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 + # precision problems on some arches, also np2 + # https://github.com/mpmath/mpmath/pull/816 + # https://github.com/mpmath/mpmath/issues/836 + mpmath/tests/test_convert.py::test_compatibility ) local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 -- cgit v1.2.3