Skip to content

Backport PR #32025 and #32031 silence numpy-dev failures #32057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 17, 2020
Merged

Backport PR #32025 and #32031 silence numpy-dev failures #32057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7aa063
CI: silence numpy-dev failures (#32025)
simonjayhawkins Feb 15, 2020
c2be051
CI: change np-dev xfails to not strict (#32031)
simonjayhawkins Feb 16, 2020
fe28218
test_transform_transformation_func not backported
simonjayhawkins Feb 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pandas/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
_np_version_under1p16,
_np_version_under1p17,
_np_version_under1p18,
_is_numpy_dev,
)

try:
Expand Down
1 change: 1 addition & 0 deletions pandas/tests/api/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ class TestPDApi(Base):
"_np_version_under1p16",
"_np_version_under1p17",
"_np_version_under1p18",
"_is_numpy_dev",
"_testing",
"_tslib",
"_typing",
Expand Down
13 changes: 12 additions & 1 deletion pandas/tests/frame/test_cumulative.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
"""

import numpy as np
import pytest

from pandas import DataFrame, Series
from pandas import DataFrame, Series, _is_numpy_dev
import pandas._testing as tm


Expand Down Expand Up @@ -73,6 +74,11 @@ def test_cumprod(self, datetime_frame):
df.cumprod(0)
df.cumprod(1)

@pytest.mark.xfail(
_is_numpy_dev,
reason="https://github.com/pandas-dev/pandas/issues/31992",
strict=False,
)
def test_cummin(self, datetime_frame):
datetime_frame.loc[5:10, 0] = np.nan
datetime_frame.loc[10:15, 1] = np.nan
Expand All @@ -96,6 +102,11 @@ def test_cummin(self, datetime_frame):
cummin_xs = datetime_frame.cummin(axis=1)
assert np.shape(cummin_xs) == np.shape(datetime_frame)

@pytest.mark.xfail(
_is_numpy_dev,
reason="https://github.com/pandas-dev/pandas/issues/31992",
strict=False,
)
def test_cummax(self, datetime_frame):
datetime_frame.loc[5:10, 0] = np.nan
datetime_frame.loc[10:15, 1] = np.nan
Expand Down
6 changes: 6 additions & 0 deletions pandas/tests/groupby/test_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
NaT,
Series,
Timestamp,
_is_numpy_dev,
date_range,
isna,
)
Expand Down Expand Up @@ -685,6 +686,11 @@ def test_numpy_compat(func):
getattr(g, func)(foo=1)


@pytest.mark.xfail(
_is_numpy_dev,
reason="https://github.com/pandas-dev/pandas/issues/31992",
strict=False,
)
def test_cummin_cummax():
# GH 15048
num_types = [np.int32, np.int64, np.float32, np.float64]
Expand Down
18 changes: 16 additions & 2 deletions pandas/tests/scalar/timedelta/test_arithmetic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import pytest

import pandas as pd
from pandas import NaT, Timedelta, Timestamp, offsets
from pandas import NaT, Timedelta, Timestamp, _is_numpy_dev, offsets
import pandas._testing as tm
from pandas.core import ops

Expand Down Expand Up @@ -377,7 +377,21 @@ def test_td_div_numeric_scalar(self):
assert isinstance(result, Timedelta)
assert result == Timedelta(days=2)

@pytest.mark.parametrize("nan", [np.nan, np.float64("NaN"), float("nan")])
@pytest.mark.parametrize(
"nan",
[
np.nan,
pytest.param(
np.float64("NaN"),
marks=pytest.mark.xfail(
_is_numpy_dev,
reason="https://github.com/pandas-dev/pandas/issues/31992",
strict=False,
),
),
float("nan"),
],
)
def test_td_div_nan(self, nan):
# np.float64('NaN') has a 'dtype' attr, avoid treating as array
td = Timedelta(10, unit="d")
Expand Down
11 changes: 11 additions & 0 deletions pandas/tests/series/test_cumulative.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import pytest

import pandas as pd
from pandas import _is_numpy_dev
import pandas._testing as tm


Expand All @@ -37,6 +38,11 @@ def test_cumsum(self, datetime_series):
def test_cumprod(self, datetime_series):
_check_accum_op("cumprod", datetime_series)

@pytest.mark.xfail(
_is_numpy_dev,
reason="https://github.com/pandas-dev/pandas/issues/31992",
strict=False,
)
def test_cummin(self, datetime_series):
tm.assert_numpy_array_equal(
datetime_series.cummin().values,
Expand All @@ -49,6 +55,11 @@ def test_cummin(self, datetime_series):

tm.assert_series_equal(result, expected)

@pytest.mark.xfail(
_is_numpy_dev,
reason="https://github.com/pandas-dev/pandas/issues/31992",
strict=False,
)
def test_cummax(self, datetime_series):
tm.assert_numpy_array_equal(
datetime_series.cummax().values,
Expand Down