gentoo resync : 17.08.2021

4 files changed, 73 insertions, 1 deletions

diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest
index 656f8e8a5390..d0c15188bf3e 100644
--- a/dev-python/quantities/Manifest
+++ b/dev-python/quantities/Manifest
@@ -1,3 +1,6 @@
+AUX quantities-0.12.5-numpy-1.21.patch 1081 BLAKE2B cad600d3961359dcfe3ae0534510e03300a81d0d7e8911c037abe556ae8d81e2cf813712c042c6663624103af1eb08fca144ff34c8c16680ff0450d8b340f3da SHA512 b0b027a80c121d9f9fe453f3663b46e1ef4f38781a107025a201ae18f6bee9b1d3473fe25eb74a2e79e10097f93cb06f34493cfafb7c2a35bd64704f3fb6a351
 DIST python-quantities-0.12.4.tar.gz 104093 BLAKE2B 84587726ef3c2f4c7dce4ea538363aecc42aa88c31d2990f834f2de9540b52d6ca0c437c1876a4c2dd5512b4be3af95cc64a1294ea60555ed1b51819f7f46125 SHA512 b5d181880d0789e6fbd55837c5ce65b677764a718be4550f1f553131e171caa59f8fc84d67e69563a293cda01e7b0678074fb311b3766f0013e658a9fa00471f
+DIST python-quantities-0.12.5.tar.gz 105130 BLAKE2B db1cf09fa2efc249bc722abe34ed71d0f59d85595f70baf44203785c32179a3598be8aac225adadfd7d5f09c44ec077dcef310ee2fe7ce4d49a1533b04cb9de6 SHA512 db81e45d464e65d6b144d05e1b990fccc5c17ab7fdd47c7bb0c0094ebcacd6af52a3692492561af3a694741810ddac03e4c887d7c6effed833f196493da5f156
 EBUILD quantities-0.12.4.ebuild 818 BLAKE2B 139945a3e343468e1e4a24cf6483645a5c819ac3d860e552923764325d040eca4b4d4fe3a1505e2831664ddcd4b4a4f06a62fc4f7bdff36acb742e608fce75f7 SHA512 9d8c51fe991fcb60b14fdae709007785de7c5670f8201e30970f7e49d11099bbbe22e940ba5df4c6d9624c3494e4118b947d90b720d94230c7f49a3aa1bd96ca
-MISC metadata.xml 544 BLAKE2B dab969c411e379d68269b491b7a0d132c3512d7bd7510e1ca58b2c1be128515df401a2b61533ab4e188edbb1385ff6108dd0387cfcbc5cb351eb9dedb56e5ac7 SHA512 21475f5b2b97ff228bb0e8cc6b86ffcbf422fc8e20c267eb40af57bc735a3ece6e9ecc4ccb9ed4a8533c2a18d21b300197382bf9be297584daa4f81329f64d5c
+EBUILD quantities-0.12.5.ebuild 770 BLAKE2B 253b04a127ed222a7094b38ef204f9c30d7602033497520310660a1e2eb082ea47795e5d7059421c27c4f1fe649cc435ec4b61914158aa1126f11cd6a29c41d8 SHA512 1376a543dc40367d8e18699e7d28d32d224718e91518693a1db8e693919ef8076c6cccef6f0d141807f3773ac623e12609e218afe05dd24742d4b5fc84d3e6a2
+MISC metadata.xml 645 BLAKE2B c710f4e3375075dfcbb9b11576191e96e0ff9e0c9eb7da74fa13db93a43df02c390a1974e40ae1394a471efaeaf0816e9fa3d17588dac98f08478fc6db2ff502 SHA512 42c552c86922b611f3cb2ac14388f356026fe6c49b75373b269f6e69a99b2b5f42a18d6d990dadedec04772ead938c0171fc6eeb2faeb04d5e7aa27afc60695b
diff --git a/dev-python/quantities/files/quantities-0.12.5-numpy-1.21.patch b/dev-python/quantities/files/quantities-0.12.5-numpy-1.21.patch
new file mode 100644
index 000000000000..34dd5a075412
--- /dev/null
+++ b/dev-python/quantities/files/quantities-0.12.5-numpy-1.21.patch
@@ -0,0 +1,29 @@
+From f32e0ce2feeb588eb8b7236700c8c1176e2bc499 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 17 Aug 2021 08:24:07 +0200
+Subject: [PATCH] fix expected np.arctan2() exception for numpy 1.21
+
+NumPy 1.21 has changed the exception type for incorrect np.arctan2()
+arguments from ValueError to TypeError.  Adjust the test appropriately.
+
+Fixes #190
+---
+ quantities/tests/test_umath.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/quantities/tests/test_umath.py b/quantities/tests/test_umath.py
+index f5aeb78..a7ebb18 100644
+--- a/quantities/tests/test_umath.py
++++ b/quantities/tests/test_umath.py
+@@ -226,7 +226,7 @@ class TestUmath(TestCase):
+             np.arctan2(3*pq.V, 3*pq.V),
+             np.radians(45)*pq.dimensionless
+             )
+-        self.assertRaises(ValueError, np.arctan2, (1*pq.m, 1*pq.m))
++        self.assertRaises((TypeError, ValueError), np.arctan2, (1*pq.m, 1*pq.m))
+ 
+     def test_hypot(self):
+         self.assertQuantityEqual(np.hypot(3 * pq.m, 4 * pq.m),  5 * pq.m)
+-- 
+2.32.0
+
diff --git a/dev-python/quantities/metadata.xml b/dev-python/quantities/metadata.xml
index 8065a3f7e296..ad73e0b5b6d6 100644
--- a/dev-python/quantities/metadata.xml
+++ b/dev-python/quantities/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">python-quantities/python-quantities</remote-id>
 		<remote-id type="pypi">quantities</remote-id>
diff --git a/dev-python/quantities/quantities-0.12.5.ebuild b/dev-python/quantities/quantities-0.12.5.ebuild
new file mode 100644
index 000000000000..fe5b4e6f264f
--- /dev/null
+++ b/dev-python/quantities/quantities-0.12.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+MY_P="python-quantities-${PV}"
+DESCRIPTION="Support for physical quantities with units, based on numpy"
+HOMEPAGE="https://github.com/python-quantities/python-quantities"
+SRC_URI="
+	https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[$PYTHON_USEDEP]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-numpy-1.21.patch
+)
+
+EPYTEST_DESELECT=(
+	# unexpected success
+	quantities/tests/test_umath.py::TestUmath::test_fix
+)