From 4cc3e93cdf0ead5757dd06273336876fc89b64f4 Mon Sep 17 00:00:00 2001 From: Justus Magin Date: Tue, 12 Mar 2024 15:35:45 +0100 Subject: [PATCH 1/2] remove all mentions of `cumproduct` --- pint/facets/numpy/numpy_func.py | 2 +- pint/testsuite/test_numpy.py | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pint/facets/numpy/numpy_func.py b/pint/facets/numpy/numpy_func.py index 57dc5123d..1a80fbb6d 100644 --- a/pint/facets/numpy/numpy_func.py +++ b/pint/facets/numpy/numpy_func.py @@ -965,7 +965,7 @@ def implementation(a, *args, **kwargs): return a._REGISTRY.Quantity(func(a_stripped, *args, **kwargs)) -for func_str in ("cumprod", "cumproduct", "nancumprod"): +for func_str in ("cumprod", "cumprod", "nancumprod"): implement_single_dimensionless_argument_func(func_str) # Handle single-argument consistent unit functions diff --git a/pint/testsuite/test_numpy.py b/pint/testsuite/test_numpy.py index b0adf24a2..69c8128c0 100644 --- a/pint/testsuite/test_numpy.py +++ b/pint/testsuite/test_numpy.py @@ -380,12 +380,7 @@ def test_cumprod(self): def test_cumprod_numpy_func(self): with pytest.raises(DimensionalityError): np.cumprod(self.q) - with pytest.raises(DimensionalityError): - np.cumproduct(self.q) helpers.assert_quantity_equal(np.cumprod(self.q / self.ureg.m), [1, 2, 6, 24]) - helpers.assert_quantity_equal( - np.cumproduct(self.q / self.ureg.m), [1, 2, 6, 24] - ) helpers.assert_quantity_equal( np.cumprod(self.q / self.ureg.m, axis=1), [[1, 2], [3, 12]] ) From 2df7459c00f0fc4566d1c07a2611ddd3fd3001b1 Mon Sep 17 00:00:00 2001 From: Justus Magin Date: Wed, 13 Mar 2024 18:37:34 +0100 Subject: [PATCH 2/2] deduplicate the definition of `cumprod` Co-authored-by: Matt Thompson --- pint/facets/numpy/numpy_func.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pint/facets/numpy/numpy_func.py b/pint/facets/numpy/numpy_func.py index 1a80fbb6d..29724837f 100644 --- a/pint/facets/numpy/numpy_func.py +++ b/pint/facets/numpy/numpy_func.py @@ -965,7 +965,7 @@ def implementation(a, *args, **kwargs): return a._REGISTRY.Quantity(func(a_stripped, *args, **kwargs)) -for func_str in ("cumprod", "cumprod", "nancumprod"): +for func_str in ("cumprod", "nancumprod"): implement_single_dimensionless_argument_func(func_str) # Handle single-argument consistent unit functions