From ea381cb0dad3a3e1af39598c5701eb06d92c3143 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 22:18:58 +0800 Subject: [PATCH 01/21] Update compute.py --- python/pyarrow/compute.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyarrow/compute.py b/python/pyarrow/compute.py index 0fefa18dd11..1a3f753c688 100644 --- a/python/pyarrow/compute.py +++ b/python/pyarrow/compute.py @@ -34,7 +34,7 @@ CastOptions, CountOptions, CumulativeOptions, - CumulativeOptions as CumulativeSumOptions, + CumulativeSumOptions, DayOfWeekOptions, DictionaryEncodeOptions, RunEndEncodeOptions, From 1ee974fc018c03ea6848bd6397d50b919dee05fa Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 22:20:11 +0800 Subject: [PATCH 02/21] Update _compute.pyx --- python/pyarrow/_compute.pyx | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index ac7efeff41a..e67f283dfd9 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -1933,6 +1933,34 @@ class PartitionNthOptions(_PartitionNthOptions): self._set_options(pivot, null_placement) +cdef class _CumulativeSumOptions(FunctionOptions): + def _set_options(self, start, skip_nulls): + if not isinstance(start, Scalar): + try: + start = lib.scalar(start) + except Exception: + _raise_invalid_function_option( + start, "`start` type for CumulativeSumOptions", TypeError) + + self.wrapped.reset(new CCumulativeOptions(pyarrow_unwrap_scalar(start), skip_nulls)) + + +class CumulativeOptions(_CumulativeOptions): + """ + Options for `cumulative_sum` function. + + Parameters + ---------- + start : Scalar, default 0.0 + Starting value for sum computation + skip_nulls : bool, default False + When false, the first encountered null is propagated. + """ + + def __init__(self, start=0.0, *, skip_nulls=False): + self._set_options(start, skip_nulls) + + cdef class _CumulativeOptions(FunctionOptions): def _set_options(self, start, skip_nulls): if start is None: From 4bd566392e0a924f3ecdfc25908c8926e0d4ab2e Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 22:20:59 +0800 Subject: [PATCH 03/21] Update test_compute.py --- python/pyarrow/tests/test_compute.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/pyarrow/tests/test_compute.py b/python/pyarrow/tests/test_compute.py index 98ab84c0390..f8d7ec16159 100644 --- a/python/pyarrow/tests/test_compute.py +++ b/python/pyarrow/tests/test_compute.py @@ -157,6 +157,7 @@ def test_option_class_equality(): pc.PadOptions(5), pc.PairwiseOptions(period=1), pc.PartitionNthOptions(1, null_placement="at_start"), + pc.CumulativeSumOptions(start=0, skip_nulls=False), pc.CumulativeOptions(start=None, skip_nulls=False), pc.QuantileOptions(), pc.RandomOptions(), From 4fcb0870274539c1585783f47f1882a15004b11c Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 22:39:58 +0800 Subject: [PATCH 04/21] fix lint --- python/pyarrow/_compute.pyx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index e67f283dfd9..e2df613b6f7 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -1941,7 +1941,7 @@ cdef class _CumulativeSumOptions(FunctionOptions): except Exception: _raise_invalid_function_option( start, "`start` type for CumulativeSumOptions", TypeError) - + self.wrapped.reset(new CCumulativeOptions(pyarrow_unwrap_scalar(start), skip_nulls)) @@ -1975,7 +1975,7 @@ cdef class _CumulativeOptions(FunctionOptions): pyarrow_unwrap_scalar(start), skip_nulls)) except Exception: _raise_invalid_function_option( - start, "`start` type for CumulativeSumOptions", TypeError) + start, "`start` type for CumulativeOptions", TypeError) class CumulativeOptions(_CumulativeOptions): From 90d6d4d60dee3cbf7399b8508bc42f2347e006f0 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 22:41:50 +0800 Subject: [PATCH 05/21] fix bug --- python/pyarrow/_compute.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index e2df613b6f7..9a60e273454 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -1945,7 +1945,7 @@ cdef class _CumulativeSumOptions(FunctionOptions): self.wrapped.reset(new CCumulativeOptions(pyarrow_unwrap_scalar(start), skip_nulls)) -class CumulativeOptions(_CumulativeOptions): +class CumulativeSumOptions(_CumulativeSumOptions): """ Options for `cumulative_sum` function. From 14d4595d2ab62896349bce99148dd7bff99cee5c Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 23:09:24 +0800 Subject: [PATCH 06/21] deseri --- python/pyarrow/_compute.pyx | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index 9a60e273454..f40b13e23d2 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -1944,6 +1944,29 @@ cdef class _CumulativeSumOptions(FunctionOptions): self.wrapped.reset(new CCumulativeOptions(pyarrow_unwrap_scalar(start), skip_nulls)) + @staticmethod + def deserialize(buf): + """ + Deserialize _CumulativeSumOptions. + + Parameters + ---------- + buf : Buffer + The buffer containing the data to deserialize. + """ + cdef: + shared_ptr[CBuffer] c_buf = pyarrow_unwrap_buffer(buf) + CResult[unique_ptr[CFunctionOptions]] maybe_options = \ + DeserializeFunctionOptions(deref(c_buf)) + shared_ptr[CFunctionOptions] c_options + c_options = to_shared(GetResultValue(move(maybe_options))) + type_name = frombytes(c_options.get().options_type().type_name()) + if type_name != "CumulativeOptions": + raise ValueError(f'Cannot deserialize "{type_name}"') + options = CumulativeSumOptions.__new__(CumulativeSumOptions) + ( options).init(c_options) + return options + class CumulativeSumOptions(_CumulativeSumOptions): """ From 26fd638f1cab6b0e465fdbe63c1d87a744d8404d Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 23:29:30 +0800 Subject: [PATCH 07/21] Update _compute.pyx --- python/pyarrow/_compute.pyx | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index f40b13e23d2..9a60e273454 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -1944,29 +1944,6 @@ cdef class _CumulativeSumOptions(FunctionOptions): self.wrapped.reset(new CCumulativeOptions(pyarrow_unwrap_scalar(start), skip_nulls)) - @staticmethod - def deserialize(buf): - """ - Deserialize _CumulativeSumOptions. - - Parameters - ---------- - buf : Buffer - The buffer containing the data to deserialize. - """ - cdef: - shared_ptr[CBuffer] c_buf = pyarrow_unwrap_buffer(buf) - CResult[unique_ptr[CFunctionOptions]] maybe_options = \ - DeserializeFunctionOptions(deref(c_buf)) - shared_ptr[CFunctionOptions] c_options - c_options = to_shared(GetResultValue(move(maybe_options))) - type_name = frombytes(c_options.get().options_type().type_name()) - if type_name != "CumulativeOptions": - raise ValueError(f'Cannot deserialize "{type_name}"') - options = CumulativeSumOptions.__new__(CumulativeSumOptions) - ( options).init(c_options) - return options - class CumulativeSumOptions(_CumulativeSumOptions): """ From 4a5d372bd53f620e2dc22359efa00db60cacb6a6 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 23:29:50 +0800 Subject: [PATCH 08/21] Update compute.py --- python/pyarrow/compute.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python/pyarrow/compute.py b/python/pyarrow/compute.py index 1a3f753c688..30e47ae82ca 100644 --- a/python/pyarrow/compute.py +++ b/python/pyarrow/compute.py @@ -34,7 +34,6 @@ CastOptions, CountOptions, CumulativeOptions, - CumulativeSumOptions, DayOfWeekOptions, DictionaryEncodeOptions, RunEndEncodeOptions, From ef26711fb9d7108ca6d92c74d4a0d4917298e8cb Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 23:30:18 +0800 Subject: [PATCH 09/21] Update compute.py --- python/pyarrow/compute.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/pyarrow/compute.py b/python/pyarrow/compute.py index 30e47ae82ca..0a22a927efd 100644 --- a/python/pyarrow/compute.py +++ b/python/pyarrow/compute.py @@ -33,6 +33,7 @@ AssumeTimezoneOptions, CastOptions, CountOptions, + CumulativeSumOptions, CumulativeOptions, DayOfWeekOptions, DictionaryEncodeOptions, From 17b828506fef3098d8c6d37df9b81f81a4071b92 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 23:30:40 +0800 Subject: [PATCH 10/21] Update test_compute.py --- python/pyarrow/tests/test_compute.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python/pyarrow/tests/test_compute.py b/python/pyarrow/tests/test_compute.py index f8d7ec16159..98ab84c0390 100644 --- a/python/pyarrow/tests/test_compute.py +++ b/python/pyarrow/tests/test_compute.py @@ -157,7 +157,6 @@ def test_option_class_equality(): pc.PadOptions(5), pc.PairwiseOptions(period=1), pc.PartitionNthOptions(1, null_placement="at_start"), - pc.CumulativeSumOptions(start=0, skip_nulls=False), pc.CumulativeOptions(start=None, skip_nulls=False), pc.QuantileOptions(), pc.RandomOptions(), From 3de17c10b0980e5cace83dd76f673c46f8d17614 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 1 Aug 2023 23:49:10 +0800 Subject: [PATCH 11/21] Update compute.py --- python/pyarrow/compute.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyarrow/compute.py b/python/pyarrow/compute.py index 0a22a927efd..1a3f753c688 100644 --- a/python/pyarrow/compute.py +++ b/python/pyarrow/compute.py @@ -33,8 +33,8 @@ AssumeTimezoneOptions, CastOptions, CountOptions, - CumulativeSumOptions, CumulativeOptions, + CumulativeSumOptions, DayOfWeekOptions, DictionaryEncodeOptions, RunEndEncodeOptions, From 265dc308dbcbb83934e387fb800a6fc6dfa78e5e Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Wed, 2 Aug 2023 09:56:41 +0800 Subject: [PATCH 12/21] update --- python/pyarrow/_compute.pyx | 46 ++++++++++------------------ python/pyarrow/tests/test_compute.py | 6 +++- 2 files changed, 22 insertions(+), 30 deletions(-) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index 9a60e273454..ff08207899b 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -29,7 +29,7 @@ from pyarrow.lib cimport * from pyarrow.includes.common cimport * from pyarrow.includes.libarrow cimport * import pyarrow.lib as lib - +from pyarrow.util import _deprecate_class from libcpp cimport bool as c_bool import inspect @@ -1933,34 +1933,6 @@ class PartitionNthOptions(_PartitionNthOptions): self._set_options(pivot, null_placement) -cdef class _CumulativeSumOptions(FunctionOptions): - def _set_options(self, start, skip_nulls): - if not isinstance(start, Scalar): - try: - start = lib.scalar(start) - except Exception: - _raise_invalid_function_option( - start, "`start` type for CumulativeSumOptions", TypeError) - - self.wrapped.reset(new CCumulativeOptions(pyarrow_unwrap_scalar(start), skip_nulls)) - - -class CumulativeSumOptions(_CumulativeSumOptions): - """ - Options for `cumulative_sum` function. - - Parameters - ---------- - start : Scalar, default 0.0 - Starting value for sum computation - skip_nulls : bool, default False - When false, the first encountered null is propagated. - """ - - def __init__(self, start=0.0, *, skip_nulls=False): - self._set_options(start, skip_nulls) - - cdef class _CumulativeOptions(FunctionOptions): def _set_options(self, start, skip_nulls): if start is None: @@ -2001,6 +1973,22 @@ class CumulativeOptions(_CumulativeOptions): def __init__(self, start=None, *, skip_nulls=False): self._set_options(start, skip_nulls) +@_deprecate_class("CumulativeSumOptions", CumulativeOptions, 14) +class CumulativeSumOptions(_CumulativeOptions): + """ + Options for `cumulative_sum` function. + + Parameters + ---------- + start : Scalar, default None + Starting value for sum computation + skip_nulls : bool, default False + When false, the first encountered null is propagated. + """ + + def __init__(self, start=None, *, skip_nulls=False): + self._set_options(start, skip_nulls) + cdef class _PairwiseOptions(FunctionOptions): def _set_options(self, period): diff --git a/python/pyarrow/tests/test_compute.py b/python/pyarrow/tests/test_compute.py index 98ab84c0390..dea14fcd86d 100644 --- a/python/pyarrow/tests/test_compute.py +++ b/python/pyarrow/tests/test_compute.py @@ -210,7 +210,11 @@ def test_option_class_equality(): buf = option.serialize() deserialized = pc.FunctionOptions.deserialize(buf) assert option == deserialized - assert repr(option) == repr(deserialized) + #TODO remove the check under if when the deprecated class CumulativeSumOptions is removed. + if repr(option).startswith("CumulativeSumOptions"): + assert repr(deserialized).startswith("CumulativeOptions") + else: + assert repr(option) == repr(deserialized) for option1, option2 in zip(options, options[1:]): assert option1 != option2 From b40a9ee9185fdac5a5a1a91474f5888e64143fd9 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Wed, 2 Aug 2023 09:58:06 +0800 Subject: [PATCH 13/21] remove --- python/pyarrow/_compute.pyx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index ff08207899b..4fadf7dfd19 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -29,7 +29,7 @@ from pyarrow.lib cimport * from pyarrow.includes.common cimport * from pyarrow.includes.libarrow cimport * import pyarrow.lib as lib -from pyarrow.util import _deprecate_class + from libcpp cimport bool as c_bool import inspect @@ -1973,7 +1973,7 @@ class CumulativeOptions(_CumulativeOptions): def __init__(self, start=None, *, skip_nulls=False): self._set_options(start, skip_nulls) -@_deprecate_class("CumulativeSumOptions", CumulativeOptions, 14) + class CumulativeSumOptions(_CumulativeOptions): """ Options for `cumulative_sum` function. From 83ca9b50cf6934e9d9eb05f330e63023d6a301fc Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Wed, 2 Aug 2023 10:08:26 +0800 Subject: [PATCH 14/21] lint --- python/pyarrow/_compute.pyx | 4 ++-- python/pyarrow/tests/test_compute.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index 4fadf7dfd19..11a14ace620 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -29,7 +29,7 @@ from pyarrow.lib cimport * from pyarrow.includes.common cimport * from pyarrow.includes.libarrow cimport * import pyarrow.lib as lib - +from pyarrow.util import _deprecate_class from libcpp cimport bool as c_bool import inspect @@ -1973,7 +1973,7 @@ class CumulativeOptions(_CumulativeOptions): def __init__(self, start=None, *, skip_nulls=False): self._set_options(start, skip_nulls) - +CumulativeSumOptions = _deprecate_class("CumulativeSumOptions", CumulativeOptions, 14) class CumulativeSumOptions(_CumulativeOptions): """ Options for `cumulative_sum` function. diff --git a/python/pyarrow/tests/test_compute.py b/python/pyarrow/tests/test_compute.py index dea14fcd86d..8cf6cf1e23d 100644 --- a/python/pyarrow/tests/test_compute.py +++ b/python/pyarrow/tests/test_compute.py @@ -210,7 +210,7 @@ def test_option_class_equality(): buf = option.serialize() deserialized = pc.FunctionOptions.deserialize(buf) assert option == deserialized - #TODO remove the check under if when the deprecated class CumulativeSumOptions is removed. + # TODO remove the check under if when the deprecated class CumulativeSumOptions is removed. if repr(option).startswith("CumulativeSumOptions"): assert repr(deserialized).startswith("CumulativeOptions") else: From d30b905b7ce35e4f23dc5faa58cafb03cb3ebf4a Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Wed, 2 Aug 2023 10:09:26 +0800 Subject: [PATCH 15/21] lint --- python/pyarrow/_compute.pyx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index 11a14ace620..4fadf7dfd19 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -29,7 +29,7 @@ from pyarrow.lib cimport * from pyarrow.includes.common cimport * from pyarrow.includes.libarrow cimport * import pyarrow.lib as lib -from pyarrow.util import _deprecate_class + from libcpp cimport bool as c_bool import inspect @@ -1973,7 +1973,7 @@ class CumulativeOptions(_CumulativeOptions): def __init__(self, start=None, *, skip_nulls=False): self._set_options(start, skip_nulls) -CumulativeSumOptions = _deprecate_class("CumulativeSumOptions", CumulativeOptions, 14) + class CumulativeSumOptions(_CumulativeOptions): """ Options for `cumulative_sum` function. From c126eb48b4d9f55e4accc11e1b5f14e2772b2dd5 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Wed, 2 Aug 2023 10:35:25 +0800 Subject: [PATCH 16/21] lint --- python/pyarrow/tests/test_compute.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/pyarrow/tests/test_compute.py b/python/pyarrow/tests/test_compute.py index 8cf6cf1e23d..f23faaa2443 100644 --- a/python/pyarrow/tests/test_compute.py +++ b/python/pyarrow/tests/test_compute.py @@ -210,7 +210,8 @@ def test_option_class_equality(): buf = option.serialize() deserialized = pc.FunctionOptions.deserialize(buf) assert option == deserialized - # TODO remove the check under if when the deprecated class CumulativeSumOptions is removed. + # TODO remove the check under if + # when the deprecated class CumulativeSumOptions is removed. if repr(option).startswith("CumulativeSumOptions"): assert repr(deserialized).startswith("CumulativeOptions") else: From 8ed32d2e2559d359afa7f6b38dc3ee45aa0b9331 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Wed, 2 Aug 2023 11:54:25 +0800 Subject: [PATCH 17/21] lint --- python/pyarrow/tests/test_compute.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyarrow/tests/test_compute.py b/python/pyarrow/tests/test_compute.py index f23faaa2443..4bd6506a8cd 100644 --- a/python/pyarrow/tests/test_compute.py +++ b/python/pyarrow/tests/test_compute.py @@ -210,7 +210,7 @@ def test_option_class_equality(): buf = option.serialize() deserialized = pc.FunctionOptions.deserialize(buf) assert option == deserialized - # TODO remove the check under if + # TODO remove the check under if # when the deprecated class CumulativeSumOptions is removed. if repr(option).startswith("CumulativeSumOptions"): assert repr(deserialized).startswith("CumulativeOptions") From 98b6e1409fdb514f9703bc1875d282f0d3e0ee4e Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Thu, 3 Aug 2023 12:10:30 +0800 Subject: [PATCH 18/21] add a warning --- python/pyarrow/_compute.pyx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index 4fadf7dfd19..76b211fe4bb 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -29,11 +29,12 @@ from pyarrow.lib cimport * from pyarrow.includes.common cimport * from pyarrow.includes.libarrow cimport * import pyarrow.lib as lib - +from pyarrow.util import _DEPR_MSG from libcpp cimport bool as c_bool import inspect import numpy as np +import warnings def _forbid_instantiation(klass, subclasses_instead=True): @@ -1987,6 +1988,10 @@ class CumulativeSumOptions(_CumulativeOptions): """ def __init__(self, start=None, *, skip_nulls=False): + warnings.warn( + _DEPR_MSG.format("CumulativeSumOptions", "14.0", "CumulativeOptions"), + FutureWarning, + ) self._set_options(start, skip_nulls) From 112e1b1e10db2e2018bcc3dd17b40159778a8134 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Thu, 3 Aug 2023 15:10:24 +0800 Subject: [PATCH 19/21] lint --- python/pyarrow/_compute.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index 76b211fe4bb..5fb9b6e69e1 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -1991,7 +1991,7 @@ class CumulativeSumOptions(_CumulativeOptions): warnings.warn( _DEPR_MSG.format("CumulativeSumOptions", "14.0", "CumulativeOptions"), FutureWarning, - ) + ) self._set_options(start, skip_nulls) From 659f57b1aff32491e2e134d6a6895bbe96f0ea79 Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Sat, 12 Aug 2023 08:53:11 +0800 Subject: [PATCH 20/21] Update python/pyarrow/_compute.pyx Co-authored-by: Dane Pitkin <48041712+danepitkin@users.noreply.github.com> --- python/pyarrow/_compute.pyx | 1 + 1 file changed, 1 insertion(+) diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx index 5fb9b6e69e1..0842361908f 100644 --- a/python/pyarrow/_compute.pyx +++ b/python/pyarrow/_compute.pyx @@ -1991,6 +1991,7 @@ class CumulativeSumOptions(_CumulativeOptions): warnings.warn( _DEPR_MSG.format("CumulativeSumOptions", "14.0", "CumulativeOptions"), FutureWarning, + stacklevel=2 ) self._set_options(start, skip_nulls) From 9a9fb87960bb74138f37b3eabcf95dcb3e7e233b Mon Sep 17 00:00:00 2001 From: Junming Chen Date: Tue, 22 Aug 2023 14:16:46 +0800 Subject: [PATCH 21/21] Update python/pyarrow/tests/test_compute.py Co-authored-by: Alenka Frim --- python/pyarrow/tests/test_compute.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/pyarrow/tests/test_compute.py b/python/pyarrow/tests/test_compute.py index 4bd6506a8cd..3c8e4ce8f8f 100644 --- a/python/pyarrow/tests/test_compute.py +++ b/python/pyarrow/tests/test_compute.py @@ -210,7 +210,7 @@ def test_option_class_equality(): buf = option.serialize() deserialized = pc.FunctionOptions.deserialize(buf) assert option == deserialized - # TODO remove the check under if + # TODO remove the check under the if statement # when the deprecated class CumulativeSumOptions is removed. if repr(option).startswith("CumulativeSumOptions"): assert repr(deserialized).startswith("CumulativeOptions")