From 5086a9a6157edd7ed03a394f6fb234dcb4b41259 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 1 Jul 2020 11:31:21 -0500 Subject: [PATCH 1/4] Fix numpy warning --- pandas/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index d74c43069574f..bc5ff4876f518 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -257,7 +257,7 @@ def nselect_method(request): # Missing values & co. # ---------------------------------------------------------------- @pytest.fixture( - params=[None, np.nan, pd.NaT, float("nan"), np.float("NaN"), pd.NA], ids=str + params=[None, np.nan, pd.NaT, float("nan"), float("nan"), pd.NA], ids=str ) def nulls_fixture(request): """ From 8ec8d47f80bcaabb19d4e4a2049a2a4cbef787e1 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 1 Jul 2020 14:29:37 -0500 Subject: [PATCH 2/4] Update conftest.py --- pandas/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index bc5ff4876f518..079f75663c5c6 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -257,7 +257,7 @@ def nselect_method(request): # Missing values & co. # ---------------------------------------------------------------- @pytest.fixture( - params=[None, np.nan, pd.NaT, float("nan"), float("nan"), pd.NA], ids=str + params=[None, np.nan, pd.NaT, float("nan"), np.float64("nan"), pd.NA], ids=str ) def nulls_fixture(request): """ From d62b836cfc6dad9de033d54326141c3c48a2eb8a Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 2 Jul 2020 15:18:59 -0500 Subject: [PATCH 3/4] Update conftest.py --- pandas/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index 079f75663c5c6..093267c2e87b3 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -257,7 +257,7 @@ def nselect_method(request): # Missing values & co. # ---------------------------------------------------------------- @pytest.fixture( - params=[None, np.nan, pd.NaT, float("nan"), np.float64("nan"), pd.NA], ids=str + params=[None, np.nan, pd.NaT, float("nan"), pd.NA], ids=str ) def nulls_fixture(request): """ From 2208716d6cc4d20dc5a7ca5e2c04a0df8a0d0e76 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 6 Jul 2020 07:56:17 -0500 Subject: [PATCH 4/4] format --- pandas/conftest.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index 093267c2e87b3..5fe4cc45b0006 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -256,9 +256,7 @@ def nselect_method(request): # ---------------------------------------------------------------- # Missing values & co. # ---------------------------------------------------------------- -@pytest.fixture( - params=[None, np.nan, pd.NaT, float("nan"), pd.NA], ids=str -) +@pytest.fixture(params=[None, np.nan, pd.NaT, float("nan"), pd.NA], ids=str) def nulls_fixture(request): """ Fixture for each null type in pandas.