From 13e1d03ef4419cedfd77a1cc083eb0e184def71f Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Thu, 30 Apr 2020 10:53:55 -0700 Subject: [PATCH 1/2] troubleshoot CI --- pandas/tests/series/test_constructors.py | 3 +++ pandas/tests/series/test_dtypes.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pandas/tests/series/test_constructors.py b/pandas/tests/series/test_constructors.py index 36a581a8ca492..8664f5feacd3d 100644 --- a/pandas/tests/series/test_constructors.py +++ b/pandas/tests/series/test_constructors.py @@ -1394,6 +1394,9 @@ def test_constructor_generic_timestamp_no_frequency(self, dtype): # see gh-15524, gh-15987 msg = "dtype has no unit. Please pass in" + d = np.dtype(dtype) + assert d.name in ["timedelta64", "datetime64"] # troubleshooting CI + with pytest.raises(ValueError, match=msg): Series([], dtype=dtype) diff --git a/pandas/tests/series/test_dtypes.py b/pandas/tests/series/test_dtypes.py index 05e708e575a64..f73ad3295fbf5 100644 --- a/pandas/tests/series/test_dtypes.py +++ b/pandas/tests/series/test_dtypes.py @@ -387,6 +387,9 @@ def test_astype_generic_timestamp_no_frequency(self, dtype): data = [1] s = Series(data) + d = np.dtype(dtype) + assert d.name in ["datetime64", "timedelta64"] # troubleshooting CI + msg = ( fr"The '{dtype.__name__}' dtype has no unit\. " fr"Please pass in '{dtype.__name__}\[ns\]' instead." From 1cfd6a408b0d5e2e03b9a4ac3c872e047a67b5b0 Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Thu, 30 Apr 2020 12:25:55 -0700 Subject: [PATCH 2/2] xfail --- pandas/tests/series/test_constructors.py | 7 ++++--- pandas/tests/series/test_dtypes.py | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pandas/tests/series/test_constructors.py b/pandas/tests/series/test_constructors.py index 8664f5feacd3d..22076eb05db88 100644 --- a/pandas/tests/series/test_constructors.py +++ b/pandas/tests/series/test_constructors.py @@ -1390,12 +1390,13 @@ def test_constructor_cast_object(self, index): tm.assert_series_equal(s, exp) @pytest.mark.parametrize("dtype", [np.datetime64, np.timedelta64]) - def test_constructor_generic_timestamp_no_frequency(self, dtype): + def test_constructor_generic_timestamp_no_frequency(self, dtype, request): # see gh-15524, gh-15987 msg = "dtype has no unit. Please pass in" - d = np.dtype(dtype) - assert d.name in ["timedelta64", "datetime64"] # troubleshooting CI + if np.dtype(dtype).name not in ["timedelta64", "datetime64"]: + mark = pytest.mark.xfail(reason="GH#33890 Is assigned ns unit") + request.node.add_marker(mark) with pytest.raises(ValueError, match=msg): Series([], dtype=dtype) diff --git a/pandas/tests/series/test_dtypes.py b/pandas/tests/series/test_dtypes.py index f73ad3295fbf5..bcc0b18134dad 100644 --- a/pandas/tests/series/test_dtypes.py +++ b/pandas/tests/series/test_dtypes.py @@ -382,13 +382,14 @@ def test_astype_categoricaldtype(self): tm.assert_index_equal(result.cat.categories, Index(["a", "b", "c"])) @pytest.mark.parametrize("dtype", [np.datetime64, np.timedelta64]) - def test_astype_generic_timestamp_no_frequency(self, dtype): + def test_astype_generic_timestamp_no_frequency(self, dtype, request): # see gh-15524, gh-15987 data = [1] s = Series(data) - d = np.dtype(dtype) - assert d.name in ["datetime64", "timedelta64"] # troubleshooting CI + if np.dtype(dtype).name not in ["timedelta64", "datetime64"]: + mark = pytest.mark.xfail(reason="GH#33890 Is assigned ns unit") + request.node.add_marker(mark) msg = ( fr"The '{dtype.__name__}' dtype has no unit\. "