File tree 2 files changed +7
-9
lines changed
2 files changed +7
-9
lines changed Original file line number Diff line number Diff line change @@ -1319,20 +1319,16 @@ def nullable_string_dtype(request):
1319
1319
1320
1320
@pytest .fixture (
1321
1321
params = [
1322
- pytest .param (
1323
- pd .StringDtype ("pyarrow" , na_value = np .nan ), marks = td .skip_if_no ("pyarrow" )
1324
- ),
1325
- pytest .param (
1326
- pd .StringDtype ("pyarrow" , na_value = pd .NA ), marks = td .skip_if_no ("pyarrow" )
1327
- ),
1322
+ pytest .param ("str[pyarrow]" , marks = td .skip_if_no ("pyarrow" )),
1323
+ pytest .param ("string[pyarrow]" , marks = td .skip_if_no ("pyarrow" )),
1328
1324
]
1329
1325
)
1330
1326
def pyarrow_string_dtype (request ):
1331
1327
"""
1332
1328
Parametrized fixture for string dtypes backed by Pyarrow.
1333
1329
1334
- * 'pd.StringDtype(" pyarrow", na_value=np.nan) '
1335
- * 'pd.StringDtype(" pyarrow", na_value=pd.NA) '
1330
+ * 'str[ pyarrow] '
1331
+ * 'string[ pyarrow] '
1336
1332
"""
1337
1333
return request .param
1338
1334
Original file line number Diff line number Diff line change 6
6
tests.frame.test_cumulative
7
7
"""
8
8
9
+ import re
10
+
9
11
import numpy as np
10
12
import pytest
11
13
@@ -290,6 +292,6 @@ def test_cummin_cummax_pyarrow_strings(
290
292
def test_cumprod_pyarrow_strings (self , pyarrow_string_dtype , skipna ):
291
293
# https://github.com/pandas-dev/pandas/pull/60633
292
294
ser = pd .Series (list ("xyz" ), dtype = pyarrow_string_dtype )
293
- msg = f"operation 'cumprod' not supported for dtype '{ ser .dtype } '"
295
+ msg = re . escape ( f"operation 'cumprod' not supported for dtype '{ ser .dtype } '" )
294
296
with pytest .raises (TypeError , match = msg ):
295
297
ser .cumprod (skipna = skipna )
You can’t perform that action at this time.
0 commit comments