Skip to content

Commit d625522

Browse files
rhshadrachWillAyd
authored andcommitted
fixup
1 parent 3a9200d commit d625522

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

pandas/conftest.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -1319,20 +1319,16 @@ def nullable_string_dtype(request):
13191319

13201320
@pytest.fixture(
13211321
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")),
13281324
]
13291325
)
13301326
def pyarrow_string_dtype(request):
13311327
"""
13321328
Parametrized fixture for string dtypes backed by Pyarrow.
13331329
1334-
* 'pd.StringDtype("pyarrow", na_value=np.nan)'
1335-
* 'pd.StringDtype("pyarrow", na_value=pd.NA)'
1330+
* 'str[pyarrow]'
1331+
* 'string[pyarrow]'
13361332
"""
13371333
return request.param
13381334

pandas/tests/series/test_cumulative.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
tests.frame.test_cumulative
77
"""
88

9+
import re
10+
911
import numpy as np
1012
import pytest
1113

@@ -290,6 +292,6 @@ def test_cummin_cummax_pyarrow_strings(
290292
def test_cumprod_pyarrow_strings(self, pyarrow_string_dtype, skipna):
291293
# https://github.com/pandas-dev/pandas/pull/60633
292294
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}'")
294296
with pytest.raises(TypeError, match=msg):
295297
ser.cumprod(skipna=skipna)

0 commit comments

Comments
 (0)