Skip to content

Commit ad54c65

Browse files
Backport PR pandas-dev#32025 and pandas-dev#32031 silence numpy-dev failures (pandas-dev#32057)
* CI: silence numpy-dev failures (pandas-dev#32025) * CI: change np-dev xfails to not strict (pandas-dev#32031) * test_transform_transformation_func not backported
1 parent 0e5d22e commit ad54c65

File tree

6 files changed

+47
-3
lines changed

6 files changed

+47
-3
lines changed

pandas/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
_np_version_under1p16,
2626
_np_version_under1p17,
2727
_np_version_under1p18,
28+
_is_numpy_dev,
2829
)
2930

3031
try:

pandas/tests/api/test_api.py

+1
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ class TestPDApi(Base):
198198
"_np_version_under1p16",
199199
"_np_version_under1p17",
200200
"_np_version_under1p18",
201+
"_is_numpy_dev",
201202
"_testing",
202203
"_tslib",
203204
"_typing",

pandas/tests/frame/test_cumulative.py

+12-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
"""
88

99
import numpy as np
10+
import pytest
1011

11-
from pandas import DataFrame, Series
12+
from pandas import DataFrame, Series, _is_numpy_dev
1213
import pandas._testing as tm
1314

1415

@@ -73,6 +74,11 @@ def test_cumprod(self, datetime_frame):
7374
df.cumprod(0)
7475
df.cumprod(1)
7576

77+
@pytest.mark.xfail(
78+
_is_numpy_dev,
79+
reason="https://github.com/pandas-dev/pandas/issues/31992",
80+
strict=False,
81+
)
7682
def test_cummin(self, datetime_frame):
7783
datetime_frame.loc[5:10, 0] = np.nan
7884
datetime_frame.loc[10:15, 1] = np.nan
@@ -96,6 +102,11 @@ def test_cummin(self, datetime_frame):
96102
cummin_xs = datetime_frame.cummin(axis=1)
97103
assert np.shape(cummin_xs) == np.shape(datetime_frame)
98104

105+
@pytest.mark.xfail(
106+
_is_numpy_dev,
107+
reason="https://github.com/pandas-dev/pandas/issues/31992",
108+
strict=False,
109+
)
99110
def test_cummax(self, datetime_frame):
100111
datetime_frame.loc[5:10, 0] = np.nan
101112
datetime_frame.loc[10:15, 1] = np.nan

pandas/tests/groupby/test_function.py

+6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
NaT,
1818
Series,
1919
Timestamp,
20+
_is_numpy_dev,
2021
date_range,
2122
isna,
2223
)
@@ -685,6 +686,11 @@ def test_numpy_compat(func):
685686
getattr(g, func)(foo=1)
686687

687688

689+
@pytest.mark.xfail(
690+
_is_numpy_dev,
691+
reason="https://github.com/pandas-dev/pandas/issues/31992",
692+
strict=False,
693+
)
688694
def test_cummin_cummax():
689695
# GH 15048
690696
num_types = [np.int32, np.int64, np.float32, np.float64]

pandas/tests/scalar/timedelta/test_arithmetic.py

+16-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import pytest
99

1010
import pandas as pd
11-
from pandas import NaT, Timedelta, Timestamp, offsets
11+
from pandas import NaT, Timedelta, Timestamp, _is_numpy_dev, offsets
1212
import pandas._testing as tm
1313
from pandas.core import ops
1414

@@ -377,7 +377,21 @@ def test_td_div_numeric_scalar(self):
377377
assert isinstance(result, Timedelta)
378378
assert result == Timedelta(days=2)
379379

380-
@pytest.mark.parametrize("nan", [np.nan, np.float64("NaN"), float("nan")])
380+
@pytest.mark.parametrize(
381+
"nan",
382+
[
383+
np.nan,
384+
pytest.param(
385+
np.float64("NaN"),
386+
marks=pytest.mark.xfail(
387+
_is_numpy_dev,
388+
reason="https://github.com/pandas-dev/pandas/issues/31992",
389+
strict=False,
390+
),
391+
),
392+
float("nan"),
393+
],
394+
)
381395
def test_td_div_nan(self, nan):
382396
# np.float64('NaN') has a 'dtype' attr, avoid treating as array
383397
td = Timedelta(10, unit="d")

pandas/tests/series/test_cumulative.py

+11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import pytest
1212

1313
import pandas as pd
14+
from pandas import _is_numpy_dev
1415
import pandas._testing as tm
1516

1617

@@ -37,6 +38,11 @@ def test_cumsum(self, datetime_series):
3738
def test_cumprod(self, datetime_series):
3839
_check_accum_op("cumprod", datetime_series)
3940

41+
@pytest.mark.xfail(
42+
_is_numpy_dev,
43+
reason="https://github.com/pandas-dev/pandas/issues/31992",
44+
strict=False,
45+
)
4046
def test_cummin(self, datetime_series):
4147
tm.assert_numpy_array_equal(
4248
datetime_series.cummin().values,
@@ -49,6 +55,11 @@ def test_cummin(self, datetime_series):
4955

5056
tm.assert_series_equal(result, expected)
5157

58+
@pytest.mark.xfail(
59+
_is_numpy_dev,
60+
reason="https://github.com/pandas-dev/pandas/issues/31992",
61+
strict=False,
62+
)
5263
def test_cummax(self, datetime_series):
5364
tm.assert_numpy_array_equal(
5465
datetime_series.cummax().values,

0 commit comments

Comments
 (0)