From ad77dc19e91d2c023f80e11e8974536d80e3a743 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Apr 2023 11:25:00 +0100 Subject: gentoo auto-resync : 05:04:2023 - 11:25:00 --- dev-python/quantities/Manifest | 7 +-- .../quantities/files/quantities-0.13.0-numpy.patch | 68 ---------------------- dev-python/quantities/quantities-0.13.0-r2.ebuild | 35 ----------- dev-python/quantities/quantities-0.14.0.ebuild | 36 ------------ dev-python/quantities/quantities-0.14.1.ebuild | 2 +- 5 files changed, 2 insertions(+), 146 deletions(-) delete mode 100644 dev-python/quantities/files/quantities-0.13.0-numpy.patch delete mode 100644 dev-python/quantities/quantities-0.13.0-r2.ebuild delete mode 100644 dev-python/quantities/quantities-0.14.0.ebuild (limited to 'dev-python/quantities') diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest index fbb1baefcfac..5eaf6242f165 100644 --- a/dev-python/quantities/Manifest +++ b/dev-python/quantities/Manifest @@ -1,8 +1,3 @@ -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 -DIST python-quantities-0.14.0.gh.tar.gz 84115 BLAKE2B 549ac64583ebac9a68069e678ee82ac3d9d4462dee4ebffe631c0c20d0819996b0172ceb2cb276aae52ad4dc963e3bfad8f6082d98b90bf6f94c27f807d91565 SHA512 78696938c10e613e1fd6f98f9158d51ec4e86928f9833b73321cde776d77735c119af854aaaff5542093175cd105a33266fba16b31b9e04b51c7f14f648b1e19 DIST python-quantities-0.14.1.gh.tar.gz 84275 BLAKE2B 7760a46f9f893a87badcbfd8aaad6a5598013b0cc835f17e0b788d3329be35702532fa17dc581ab0db4064292d6521d39d3ada7819c9a6c7b0e8a9b568d343dd SHA512 16c12110c2a705e4016d9575beb7f3322c3590cd12091a2710eca48fd6927b07b0d564ef93eb8af0b21688a0e86df1e60abb45625234abfaf1fa414e8b9fd110 -EBUILD quantities-0.13.0-r2.ebuild 723 BLAKE2B 9a84c8531737d5ae7ee4f1db414aa9deeb567db3866fbaa769d2ea6c1c9e11c128648b202441a4ba3907d1a76db93d201e79e01e9fa96b9b9f472763c4d45fd4 SHA512 1884fd5a3deec6ed8f4f04d396a98125fd9f1b9e3ee554a35874083548a53a2bd8a78ddac6fbd77d2a0bfb2abb9eb17a02f7f3efeb79a90677d9bfa0b8207e07 -EBUILD quantities-0.14.0.ebuild 782 BLAKE2B 4012a22ff8b79a0e8ea20105095a6759cf9b2b29ef83baf788150dbfd19a22772c74f7cbce0449f4117962e05f4779065baacfb29644fd9e34a70d72c524b80a SHA512 14a879c167d7f3c0d7e2008f4a19b04474de6c7e26d877b90ef9b15ae9eed9119cb18ac72994890ef825276f4058c4a9b791772939318baab50f5fc8d40ac87b -EBUILD quantities-0.14.1.ebuild 782 BLAKE2B 4012a22ff8b79a0e8ea20105095a6759cf9b2b29ef83baf788150dbfd19a22772c74f7cbce0449f4117962e05f4779065baacfb29644fd9e34a70d72c524b80a SHA512 14a879c167d7f3c0d7e2008f4a19b04474de6c7e26d877b90ef9b15ae9eed9119cb18ac72994890ef825276f4058c4a9b791772939318baab50f5fc8d40ac87b +EBUILD quantities-0.14.1.ebuild 780 BLAKE2B 914075c1acc5a3a6d522ea4bc6c671264b683efe9060a4180bd309a5433d3ec7493c60c93ac627fae94ebee5fd0594075f051b8c45466bb4c019d403ed0c54b9 SHA512 b0c4423004c4b124d9b42df8169b8ba943ec6a8453334ae416a14eedb001b57cae4eb0d23ed49acd61785f014fbd7b726e15801e740dc73d4e8fd5df4d15fbaf MISC metadata.xml 645 BLAKE2B d6965f033a9f7b6e78c5b2dcadda6a036ec1becac8cdd4bf3a7d2a7d0739cca4b51c29f874eebedc963d5a54d1906dc18a8ba628e44b4d3d12c81c91f6f97b29 SHA512 d2f88066eb81f72611dd94b323c9d42dbdb02d0953cb43a06b991bc7b134cff85d86979aabc155dee463645ab984127bdebfa7ca125ba36febaea451dad39143 diff --git a/dev-python/quantities/files/quantities-0.13.0-numpy.patch b/dev-python/quantities/files/quantities-0.13.0-numpy.patch deleted file mode 100644 index 940bc846d687..000000000000 --- a/dev-python/quantities/files/quantities-0.13.0-numpy.patch +++ /dev/null @@ -1,68 +0,0 @@ -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-r2.ebuild b/dev-python/quantities/quantities-0.13.0-r2.ebuild deleted file mode 100644 index f5bb3ce8d977..000000000000 --- a/dev-python/quantities/quantities-0.13.0-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..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 -) diff --git a/dev-python/quantities/quantities-0.14.0.ebuild b/dev-python/quantities/quantities-0.14.0.ebuild deleted file mode 100644 index b6edadfcb852..000000000000 --- a/dev-python/quantities/quantities-0.14.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2020-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..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.19[$PYTHON_USEDEP] -" -BDEPEND=" - dev-python/setuptools-scm[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -export SETUPTOOLS_SCM_PRETEND_VERSION=${PV} diff --git a/dev-python/quantities/quantities-0.14.1.ebuild b/dev-python/quantities/quantities-0.14.1.ebuild index b6edadfcb852..66847fdf02f5 100644 --- a/dev-python/quantities/quantities-0.14.1.ebuild +++ b/dev-python/quantities/quantities-0.14.1.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" >=dev-python/numpy-1.19[$PYTHON_USEDEP] -- cgit v1.2.3