Skip to content

CI: troubleshoot CI #33898

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 2 commits into from
May 1, 2020
Merged

CI: troubleshoot CI #33898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13e1d03
troubleshoot CI
jbrockmendel Apr 30, 2020
1cfd6a4
xfail
jbrockmendel Apr 30, 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
6 changes: 5 additions & 1 deletion pandas/tests/series/test_constructors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,10 +1390,14 @@ 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):
Copy link
Member

Choose a reason for hiding this comment

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

Is this just an alternative to an imperative call that would fail if the test doesn't produce an expected failure?

Copy link
Member Author

Choose a reason for hiding this comment

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

correct

Copy link
Member

Choose a reason for hiding this comment

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

nice. more verbose but probably a better general solution

# see gh-15524, gh-15987
msg = "dtype has no unit. Please pass in"

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)

Expand Down
6 changes: 5 additions & 1 deletion pandas/tests/series/test_dtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,15 @@ 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)

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\. "
fr"Please pass in '{dtype.__name__}\[ns\]' instead."
Expand Down