From d117172e3b48fc4be82b7623ffc40bb6070ef361 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 25 Dec 2022 20:05:44 +0000 Subject: gentoo auto-resync : 25:12:2022 - 20:05:44 --- dev-python/quantities/Manifest | 5 +- .../quantities/files/quantities-0.13.0-numpy.patch | 68 ++++++++++++++++++++++ dev-python/quantities/quantities-0.13.0-r1.ebuild | 27 --------- dev-python/quantities/quantities-0.13.0-r2.ebuild | 35 +++++++++++ 4 files changed, 106 insertions(+), 29 deletions(-) create mode 100644 dev-python/quantities/files/quantities-0.13.0-numpy.patch delete mode 100644 dev-python/quantities/quantities-0.13.0-r1.ebuild create mode 100644 dev-python/quantities/quantities-0.13.0-r2.ebuild (limited to 'dev-python/quantities') diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest index 0a4f94580f85..25551c02f68c 100644 --- a/dev-python/quantities/Manifest +++ b/dev-python/quantities/Manifest @@ -1,3 +1,4 @@ -DIST python-quantities-0.13.0.tar.gz 107187 BLAKE2B ead5c223892f65c68ced2265356f8c1e5374f80a1507ec561370e56e28e8965217a7b99f5c46cb83a5f6a1b1f12eb9f501844650488871d48794f13a4383df38 SHA512 ec0a61d8df8e48e7ee08cab5c899a8c8ad96b964ee0132ab130f272f062436d91e6370aac9d85453eeb3d95e17e79e8dfb80412397eada1f0a4310c0494fa217 -EBUILD quantities-0.13.0-r1.ebuild 632 BLAKE2B c27e0158a6301b56cdc980c7ed70c33c1e41a0d7fa69f7526fbd6789fb348842d4d740a071fd558d9b006de0e3a1265f78cacf932ed930c9d9a90e8025ed565b SHA512 0c3057e588acb400f2963f909adfcd624788abf7d17184b8238f44078b2c7cb9d5a4759d7976cbdf694e8f50ff9f853f1fc53e4a86d5d9150ecf77d3838dec97 +AUX quantities-0.13.0-numpy.patch 2382 BLAKE2B b129afeac02154cd3e81d5c1099f637b610ec37210b5b5342cb35c3218316b7c848b5b0a78c35b7f197d76ce6d9ee1a56ee2319fa825ca3d3a953efb27d4853a SHA512 936aca8312de80f9c03ba08aa6dbb43527bb540bba18924551baacd2a861651b2d6923c5899adc21d555da6c11229d11b5ffe253d47e05023cf2e2efcc773837 +DIST python-quantities-0.13.0.gh.tar.gz 107178 BLAKE2B f5fe69ed1d82bc90620a1cabf4c68f676330a2b09e8590bedf48ee8c46e3176d57e0dc6374d1112377056cd1138553d92f0bcaf0a68e2600e3631226e2262afc SHA512 d108b0f5bd834aeb7443693175d54b2b01fa9110cc57f0356681374ce95b5f57e39253d9c8166365aabc379f2f26bba3a827689ceb6c45595345e140b4cd7ad3 +EBUILD quantities-0.13.0-r2.ebuild 723 BLAKE2B 1859adbe4079c7d98b3c6511ef4082b71b7ee0ae822097e93a2abe4935451879946c4c7eedfb3362c29f4ac370f0fe623c2555d05a78c0a9f80c3711e491f730 SHA512 6021093b1d64a3d98e4d502c889c0ab229d3d8858c2997af03663c45e8b2e9b4ed13a688aecf9926f05e0837dd9fdcb0e3ff14e5cfefc18ba6225a01e6cf8d7d MISC metadata.xml 646 BLAKE2B df1d2cf46f590a90d168f7024d52942531f8b570418aeb9e5ba82882b8b8be86f57a15e3c652246ce08e42ddcaa2813ea594a45ba15e9db9bb80795736e0eff3 SHA512 0ba5443c1554361cf079ae651ffd70b979bb70f6f22049470bccd07537aa967a7e3c1d46b7c580319c4941aae984906a40216c5eb108a9f1aa95fa0680c75248 diff --git a/dev-python/quantities/files/quantities-0.13.0-numpy.patch b/dev-python/quantities/files/quantities-0.13.0-numpy.patch new file mode 100644 index 000000000000..940bc846d687 --- /dev/null +++ b/dev-python/quantities/files/quantities-0.13.0-numpy.patch @@ -0,0 +1,68 @@ +From 29852b895d5d39006d1f129397cffae3578a694e Mon Sep 17 00:00:00 2001 +From: Andrew Davison +Date: Thu, 7 Jul 2022 10:03:32 +0200 +Subject: [PATCH] fix failure to handle units with floordiv + +fixes #205 +--- + quantities/dimensionality.py | 2 +- + quantities/tests/test_arithmetic.py | 16 +++++++++++++++- + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/quantities/dimensionality.py b/quantities/dimensionality.py +index cea68ca..d54f96f 100644 +--- a/quantities/dimensionality.py ++++ b/quantities/dimensionality.py +@@ -238,6 +238,7 @@ def _d_divide(q1, q2, out=None): + return q2.dimensionality**-1 + p_dict[np.divide] = _d_divide + p_dict[np.true_divide] = _d_divide ++p_dict[np.floor_divide] = _d_divide + + def _d_check_uniform(q1, q2, out=None): + try: +@@ -273,7 +274,6 @@ p_dict[np.subtract] = _d_check_uniform + p_dict[np.mod] = _d_check_uniform + p_dict[np.fmod] = _d_check_uniform + p_dict[np.remainder] = _d_check_uniform +-p_dict[np.floor_divide] = _d_check_uniform + p_dict[np.hypot] = _d_check_uniform + p_dict[np.equal] = _d_check_uniform + p_dict[np.not_equal] = _d_check_uniform +diff --git a/quantities/tests/test_arithmetic.py b/quantities/tests/test_arithmetic.py +index fe5670e..534702c 100644 +--- a/quantities/tests/test_arithmetic.py ++++ b/quantities/tests/test_arithmetic.py +@@ -52,7 +52,7 @@ class iter_dtypes: + + def __init__(self): + self._i = 1 +- self._typeDict = np.typeDict.copy() ++ self._typeDict = np.sctypeDict.copy() + self._typeDict[17] = int + self._typeDict[18] = long + self._typeDict[19] = float +@@ -132,6 +132,20 @@ class TestDTypes(TestCase): + self.check_rmul(x, y) + dtypes.pop(0) + ++ def test_truediv(self): ++ q = Quantity([44, 40, 36, 32], units=pq.ms) ++ self.assertQuantityEqual( ++ q/(4 * pq.ms), ++ Quantity([11, 10, 9, 8], units=pq.dimensionless) ++ ) ++ ++ def test_floordiv(self): ++ q = Quantity([45, 43, 39, 32], units=pq.ms) ++ self.assertQuantityEqual( ++ q//(4 * pq.ms), ++ Quantity([11, 10, 9, 8], units=pq.dimensionless) ++ ) ++ + def test_mixed_addition(self): + self.assertQuantityEqual(1*pq.ft + 1*pq.m, 4.280839895 * pq.ft) + self.assertQuantityEqual(1*pq.ft + pq.m, 4.280839895 * pq.ft) +-- +2.39.0 + diff --git a/dev-python/quantities/quantities-0.13.0-r1.ebuild b/dev-python/quantities/quantities-0.13.0-r1.ebuild deleted file mode 100644 index 10138c6a4687..000000000000 --- a/dev-python/quantities/quantities-0.13.0-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) - -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-1.16[$PYTHON_USEDEP] -" - -distutils_enable_tests pytest diff --git a/dev-python/quantities/quantities-0.13.0-r2.ebuild b/dev-python/quantities/quantities-0.13.0-r2.ebuild new file mode 100644 index 000000000000..72f622668aa3 --- /dev/null +++ b/dev-python/quantities/quantities-0.13.0-r2.ebuild @@ -0,0 +1,35 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) + +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/ + https://pypi.org/project/quantities/ +" +SRC_URI=" + https://github.com/python-quantities/python-quantities/archive/v${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND=" + >=dev-python/numpy-1.16[$PYTHON_USEDEP] +" + +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/${P}-numpy.patch +) -- cgit v1.2.3