From 12e9013e2d740d00a1d0b60d7bcf4b0e997c239e Mon Sep 17 00:00:00 2001 From: Patrick Hoefler <61934744+phofl@users.noreply.github.com> Date: Sun, 9 Jul 2023 17:36:09 +0200 Subject: [PATCH 1/3] CoW: Fix test that is failing with new arrow version --- pandas/compat/pyarrow.py | 1 + pandas/tests/copy_view/test_astype.py | 14 +++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pandas/compat/pyarrow.py b/pandas/compat/pyarrow.py index 020ec346490ff..613e7f8e00912 100644 --- a/pandas/compat/pyarrow.py +++ b/pandas/compat/pyarrow.py @@ -14,6 +14,7 @@ pa_version_under9p0 = _palv < Version("9.0.0") pa_version_under10p0 = _palv < Version("10.0.0") pa_version_under11p0 = _palv < Version("11.0.0") + pa_version_under12p0 = _palv < Version("12.0.0") except ImportError: pa_version_under7p0 = True pa_version_under8p0 = True diff --git a/pandas/tests/copy_view/test_astype.py b/pandas/tests/copy_view/test_astype.py index e89bdd5af348d..1fc8ad7b3659b 100644 --- a/pandas/tests/copy_view/test_astype.py +++ b/pandas/tests/copy_view/test_astype.py @@ -12,6 +12,7 @@ date_range, ) import pandas._testing as tm +from pandas.compat.pyarrow import pa_version_under12p0 from pandas.tests.copy_view.util import get_array @@ -200,11 +201,14 @@ def test_astype_arrow_timestamp(using_copy_on_write): result = df.astype("timestamp[ns][pyarrow]") if using_copy_on_write: assert not result._mgr._has_no_reference(0) - # TODO(CoW): arrow is not setting copy=False in the Series constructor - # under the hood - assert not np.shares_memory( - get_array(df, "a"), get_array(result, "a")._pa_array - ) + if pa_version_under12p0: + assert not np.shares_memory( + get_array(df, "a"), get_array(result, "a")._pa_array + ) + else: + assert np.shares_memory( + get_array(df, "a"), get_array(result, "a")._pa_array + ) def test_convert_dtypes_infer_objects(using_copy_on_write): From 6a1c42b2837bbb817424079f7833b2ce2c96f001 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler <61934744+phofl@users.noreply.github.com> Date: Thu, 13 Jul 2023 15:09:12 -0500 Subject: [PATCH 2/3] RUn pre commit --- pandas/tests/copy_view/test_astype.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/copy_view/test_astype.py b/pandas/tests/copy_view/test_astype.py index 1fc8ad7b3659b..4b751ad452ec4 100644 --- a/pandas/tests/copy_view/test_astype.py +++ b/pandas/tests/copy_view/test_astype.py @@ -2,6 +2,7 @@ import pytest from pandas.compat import pa_version_under7p0 +from pandas.compat.pyarrow import pa_version_under12p0 import pandas.util._test_decorators as td import pandas as pd @@ -12,7 +13,6 @@ date_range, ) import pandas._testing as tm -from pandas.compat.pyarrow import pa_version_under12p0 from pandas.tests.copy_view.util import get_array From 463ee1c1de76d0e7fcd36c7734ebb4606578bf37 Mon Sep 17 00:00:00 2001 From: Patrick Hoefler <61934744+phofl@users.noreply.github.com> Date: Thu, 13 Jul 2023 15:20:56 -0500 Subject: [PATCH 3/3] Fix --- pandas/compat/pyarrow.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/compat/pyarrow.py b/pandas/compat/pyarrow.py index 613e7f8e00912..96ca790e0efd3 100644 --- a/pandas/compat/pyarrow.py +++ b/pandas/compat/pyarrow.py @@ -21,3 +21,4 @@ pa_version_under9p0 = True pa_version_under10p0 = True pa_version_under11p0 = True + pa_version_under12p0 = True