From 3d1912525956214ff8a5062cfd529cb91c1cb037 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Wed, 7 Sep 2022 23:39:54 -0400 Subject: [PATCH 01/18] Update __init__.py --- pandas/_testing/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/_testing/__init__.py b/pandas/_testing/__init__.py index 1035fd08a1a36..72147b3204f66 100644 --- a/pandas/_testing/__init__.py +++ b/pandas/_testing/__init__.py @@ -229,6 +229,7 @@ + DATETIME_PYARROW_DTYPES + TIMEDELTA_PYARROW_DTYPES + BOOL_PYARROW_DTYPES + + STRING_PYARROW_DTYPES ) From 5828e1de4e500ee3dcbf2332206ae77fa588a741 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 8 Sep 2022 08:50:06 -0400 Subject: [PATCH 02/18] Update __init__.py --- pandas/_testing/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/_testing/__init__.py b/pandas/_testing/__init__.py index 72147b3204f66..eeca494ed3d56 100644 --- a/pandas/_testing/__init__.py +++ b/pandas/_testing/__init__.py @@ -197,7 +197,7 @@ import pyarrow as pa UNSIGNED_INT_PYARROW_DTYPES = [pa.uint8(), pa.uint16(), pa.uint32(), pa.uint64()] - SIGNED_INT_PYARROW_DTYPES = [pa.uint8(), pa.int16(), pa.int32(), pa.uint64()] + SIGNED_INT_PYARROW_DTYPES = [pa.int8(), pa.int16(), pa.int32(), pa.int64()] ALL_INT_PYARROW_DTYPES = UNSIGNED_INT_PYARROW_DTYPES + SIGNED_INT_PYARROW_DTYPES FLOAT_PYARROW_DTYPES = [pa.float32(), pa.float64()] From 8c720205eee1fd80ecc6dd856749fb3eee35fa8a Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 8 Sep 2022 14:10:18 -0400 Subject: [PATCH 03/18] Update __init__.py --- pandas/_testing/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/_testing/__init__.py b/pandas/_testing/__init__.py index eeca494ed3d56..c21c1e8f7ed8e 100644 --- a/pandas/_testing/__init__.py +++ b/pandas/_testing/__init__.py @@ -229,7 +229,6 @@ + DATETIME_PYARROW_DTYPES + TIMEDELTA_PYARROW_DTYPES + BOOL_PYARROW_DTYPES - + STRING_PYARROW_DTYPES ) From 3a37d5d62ebb3e26617ab83e964e9b5b853307c3 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 8 Sep 2022 14:43:01 -0400 Subject: [PATCH 04/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 0385e4482a32b..6c0bb49524aca 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -2212,3 +2212,15 @@ def test_mode(data_for_grouping, dropna, take_idx, exp_idx, request): result = ser.mode(dropna=dropna) expected = pd.Series(data_for_grouping.take(exp_idx)) tm.assert_series_equal(result, expected) + + +@pytest.mark.parametrize( + "int_lists, signed", + [[tm.SIGNED_INT_PYARROW_DTYPES, True], [tm.UNSIGNED_INT_PYARROW_DTYPES, False]] +) +def test_global_int_lists(int_lists, signed): + for pa_dtype in int_lists: + if signed: + assert pa.types.is_signed_integer(pa_dtype) + else: + assert pa.types.is_unsigned_integer(pa_dtype) From 02ce61253005bb3ef7953c31fee4e51a515d6c32 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 8 Sep 2022 14:43:41 -0400 Subject: [PATCH 05/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 6c0bb49524aca..b797d855c43d0 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -2215,11 +2215,11 @@ def test_mode(data_for_grouping, dropna, take_idx, exp_idx, request): @pytest.mark.parametrize( - "int_lists, signed", + "int_list, signed", [[tm.SIGNED_INT_PYARROW_DTYPES, True], [tm.UNSIGNED_INT_PYARROW_DTYPES, False]] ) -def test_global_int_lists(int_lists, signed): - for pa_dtype in int_lists: +def test_global_int_lists(int_list, signed): + for pa_dtype in int_list: if signed: assert pa.types.is_signed_integer(pa_dtype) else: From e12e6198f042165297fe797167573b397242ce4e Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 8 Sep 2022 14:49:01 -0400 Subject: [PATCH 06/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index b797d855c43d0..03bbe9048ba72 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -2213,7 +2213,7 @@ def test_mode(data_for_grouping, dropna, take_idx, exp_idx, request): expected = pd.Series(data_for_grouping.take(exp_idx)) tm.assert_series_equal(result, expected) - + @pytest.mark.parametrize( "int_list, signed", [[tm.SIGNED_INT_PYARROW_DTYPES, True], [tm.UNSIGNED_INT_PYARROW_DTYPES, False]] From e309c0429f93ca9361c18b77f88f7ae6f619f1c2 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 8 Sep 2022 14:54:26 -0400 Subject: [PATCH 07/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 03bbe9048ba72..f69627614401c 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -2214,13 +2214,9 @@ def test_mode(data_for_grouping, dropna, take_idx, exp_idx, request): tm.assert_series_equal(result, expected) -@pytest.mark.parametrize( - "int_list, signed", - [[tm.SIGNED_INT_PYARROW_DTYPES, True], [tm.UNSIGNED_INT_PYARROW_DTYPES, False]] -) -def test_global_int_lists(int_list, signed): - for pa_dtype in int_list: - if signed: - assert pa.types.is_signed_integer(pa_dtype) - else: - assert pa.types.is_unsigned_integer(pa_dtype) +def test_global_int_lists(): + for pa_dtype in tm.SIGNED_INT_PYARROW_DTYPES: + assert pa.types.is_signed_integer(pa_dtype) + + for pa_dtype in tm.UNSIGNED_INT_PYARROW_DTYPES: + assert pa.types.is_unsigned_integer(pa_dtype) From 536a100c8c13c6c22a715673741cbba6821f30c9 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 8 Sep 2022 14:57:49 -0400 Subject: [PATCH 08/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index f69627614401c..7b27e62a1edf4 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -2216,7 +2216,7 @@ def test_mode(data_for_grouping, dropna, take_idx, exp_idx, request): def test_global_int_lists(): for pa_dtype in tm.SIGNED_INT_PYARROW_DTYPES: - assert pa.types.is_signed_integer(pa_dtype) + assert pa.types.is_signed_integer(ArrowDtype(pyarrow_dtype=pa_dtype)) for pa_dtype in tm.UNSIGNED_INT_PYARROW_DTYPES: - assert pa.types.is_unsigned_integer(pa_dtype) + assert pa.types.is_unsigned_integer(ArrowDtype(pyarrow_dtype=pa_dtype)) From 9ac3692700f403252445da36c47de443160395ff Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 8 Sep 2022 15:00:49 -0400 Subject: [PATCH 09/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 7b27e62a1edf4..f69627614401c 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -2216,7 +2216,7 @@ def test_mode(data_for_grouping, dropna, take_idx, exp_idx, request): def test_global_int_lists(): for pa_dtype in tm.SIGNED_INT_PYARROW_DTYPES: - assert pa.types.is_signed_integer(ArrowDtype(pyarrow_dtype=pa_dtype)) + assert pa.types.is_signed_integer(pa_dtype) for pa_dtype in tm.UNSIGNED_INT_PYARROW_DTYPES: - assert pa.types.is_unsigned_integer(ArrowDtype(pyarrow_dtype=pa_dtype)) + assert pa.types.is_unsigned_integer(pa_dtype) From 2f4c7bcf497b89227e109a3dff7fb96bfd903948 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Fri, 9 Sep 2022 13:30:11 -0400 Subject: [PATCH 10/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index f69627614401c..0385e4482a32b 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -2212,11 +2212,3 @@ def test_mode(data_for_grouping, dropna, take_idx, exp_idx, request): result = ser.mode(dropna=dropna) expected = pd.Series(data_for_grouping.take(exp_idx)) tm.assert_series_equal(result, expected) - - -def test_global_int_lists(): - for pa_dtype in tm.SIGNED_INT_PYARROW_DTYPES: - assert pa.types.is_signed_integer(pa_dtype) - - for pa_dtype in tm.UNSIGNED_INT_PYARROW_DTYPES: - assert pa.types.is_unsigned_integer(pa_dtype) From e3744aa35992b1785628924272040878080c8a59 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Tue, 11 Oct 2022 22:50:54 -0400 Subject: [PATCH 11/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 0c8221cb73eee..6006dfe6a42ae 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -1619,6 +1619,15 @@ def test_add_series_with_extension_array(self, data, request): reason=f"add_checked not implemented for {pa_dtype}", ) ) + if pa.types.is_signed_integer(pa_dtype): + request.node.add_marker( + pytest.mark.xfail( + raises=pa.ArrowInvalid, + reason=( + f"raises on overflow for {pa_dtype}" + ), + ) + ) super().test_add_series_with_extension_array(data) From 9f9785685f48949aefe0a3f59c27cf700cb89878 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Tue, 11 Oct 2022 23:15:04 -0400 Subject: [PATCH 12/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 6006dfe6a42ae..359e18882b7dc 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -1623,9 +1623,7 @@ def test_add_series_with_extension_array(self, data, request): request.node.add_marker( pytest.mark.xfail( raises=pa.ArrowInvalid, - reason=( - f"raises on overflow for {pa_dtype}" - ), + reason=f"raises on overflow for {pa_dtype}", ) ) super().test_add_series_with_extension_array(data) From 0b05c1c649c21b6a0dbaf2fe4f3fc1c50d7dd58d Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Wed, 12 Oct 2022 09:19:45 -0400 Subject: [PATCH 13/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 359e18882b7dc..b22f48c932c6a 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -1619,7 +1619,7 @@ def test_add_series_with_extension_array(self, data, request): reason=f"add_checked not implemented for {pa_dtype}", ) ) - if pa.types.is_signed_integer(pa_dtype): + elif pa.types.is_signed_integer(pa_dtype): request.node.add_marker( pytest.mark.xfail( raises=pa.ArrowInvalid, From ff10c8a15da6e5bb19d2d87a0111181416e67682 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 13 Oct 2022 00:54:51 -0400 Subject: [PATCH 14/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index b22f48c932c6a..b5070abbc8643 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -1622,8 +1622,7 @@ def test_add_series_with_extension_array(self, data, request): elif pa.types.is_signed_integer(pa_dtype): request.node.add_marker( pytest.mark.xfail( - raises=pa.ArrowInvalid, - reason=f"raises on overflow for {pa_dtype}", + raises=pa.ArrowInvalid ) ) super().test_add_series_with_extension_array(data) From 5935f1b84b1aaaa901d2b8cdb6a2582dea3258df Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 13 Oct 2022 20:58:27 -0400 Subject: [PATCH 15/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index b5070abbc8643..85d95e78d10fe 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -1619,7 +1619,7 @@ def test_add_series_with_extension_array(self, data, request): reason=f"add_checked not implemented for {pa_dtype}", ) ) - elif pa.types.is_signed_integer(pa_dtype): + elif pa_dtype.equals("int8"): request.node.add_marker( pytest.mark.xfail( raises=pa.ArrowInvalid From ca5c0efde520037f8b3ba119c9b51c6ad98236e1 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 13 Oct 2022 21:01:13 -0400 Subject: [PATCH 16/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 85d95e78d10fe..09f3b0616f0e7 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -1622,7 +1622,8 @@ def test_add_series_with_extension_array(self, data, request): elif pa_dtype.equals("int8"): request.node.add_marker( pytest.mark.xfail( - raises=pa.ArrowInvalid + raises=pa.ArrowInvalid, + reason=f"raises on overflow for {pa_dtype}", ) ) super().test_add_series_with_extension_array(data) From 7465c25c0ea7319cdd64e31f86aada60409e0978 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 13 Oct 2022 22:33:06 -0400 Subject: [PATCH 17/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 09f3b0616f0e7..1780e97494604 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -1623,7 +1623,7 @@ def test_add_series_with_extension_array(self, data, request): request.node.add_marker( pytest.mark.xfail( raises=pa.ArrowInvalid, - reason=f"raises on overflow for {pa_dtype}", + reason=f"raises on overflow for int8", ) ) super().test_add_series_with_extension_array(data) From f09df4a990e7ed5145e11e7984704cd0b7653117 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 13 Oct 2022 22:33:41 -0400 Subject: [PATCH 18/18] Update test_arrow.py --- pandas/tests/extension/test_arrow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/extension/test_arrow.py b/pandas/tests/extension/test_arrow.py index 1780e97494604..09f3b0616f0e7 100644 --- a/pandas/tests/extension/test_arrow.py +++ b/pandas/tests/extension/test_arrow.py @@ -1623,7 +1623,7 @@ def test_add_series_with_extension_array(self, data, request): request.node.add_marker( pytest.mark.xfail( raises=pa.ArrowInvalid, - reason=f"raises on overflow for int8", + reason=f"raises on overflow for {pa_dtype}", ) ) super().test_add_series_with_extension_array(data)