Skip to content

CI: silence numpy-dev failures #32025

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 15, 2020
Merged

CI: silence numpy-dev failures #32025

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
62f999b
CI: silence numpy-dev failures
simonjayhawkins Feb 15, 2020
d91b182
missed one.
simonjayhawkins Feb 15, 2020
3aacffa
import _is_numpy_dev from pd namespace
simonjayhawkins Feb 15, 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
9 changes: 8 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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can use the _test_decorator version of this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you referring to pandas/util/_test_decorators.py?

we have nothing for np-dev there (just skip_if_np_lt) . also those are skips and don't we want an xfail?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok instead of importing from here (this is not meant for this)
import from pd. where all of the lives (you will to add the import in pandas/init.py

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure. we currently have a mixture of imports for _np_version_under1p* and wasn't sure which was the preferred.

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,9 @@ 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"
)
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 +100,9 @@ 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"
)
def test_cummax(self, datetime_frame):
datetime_frame.loc[5:10, 0] = np.nan
datetime_frame.loc[10:15, 1] = np.nan
Expand Down
4 changes: 4 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,9 @@ 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"
)
def test_cummin_cummax():
# GH 15048
num_types = [np.int32, np.int64, np.float32, np.float64]
Expand Down
3 changes: 3 additions & 0 deletions pandas/tests/groupby/test_transform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
MultiIndex,
Series,
Timestamp,
_is_numpy_dev,
concat,
date_range,
)
Expand Down Expand Up @@ -329,6 +330,8 @@ def test_transform_transformation_func(transformation_func):
if transformation_func in ["pad", "backfill", "tshift", "corrwith", "cumcount"]:
# These transformation functions are not yet covered in this test
pytest.xfail("See GH 31269 and GH 31270")
elif _is_numpy_dev and transformation_func in ["cummin"]:
pytest.xfail("https://github.com/pandas-dev/pandas/issues/31992")
elif transformation_func == "fillna":
test_op = lambda x: x.transform("fillna", value=0)
mock_op = lambda x: x.fillna(value=0)
Expand Down
24 changes: 17 additions & 7 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,18 +377,28 @@ 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",
),
),
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")
result = td / nan
assert result is NaT

# TODO: Don't leave commented, this is just a temporary fix for
# https://github.com/pandas-dev/pandas/issues/31992

# result = td // nan
# assert result is NaT
result = td // nan
assert result is NaT

# ---------------------------------------------------------------
# Timedelta.__rdiv__
Expand Down
7 changes: 7 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,9 @@ 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"
)
def test_cummin(self, datetime_series):
tm.assert_numpy_array_equal(
datetime_series.cummin().values,
Expand All @@ -49,6 +53,9 @@ 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"
)
def test_cummax(self, datetime_series):
tm.assert_numpy_array_equal(
datetime_series.cummax().values,
Expand Down