Skip to content

TST: handle inconsistent ordering in resample_api compat test #27196

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 4 commits into from
Jul 3, 2019
Merged

TST: handle inconsistent ordering in resample_api compat test #27196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8992760
TST: handle inconsistent ordering in resample_api compat test
jreback Jul 2, 2019
9c1d7cd
limit pytest
jreback Jul 3, 2019
dde704d
update spec
jreback Jul 3, 2019
0bf2021
moar pytest < 5.0.0
jreback Jul 3, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/deps/azure-36-locale.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- xlsxwriter=0.9.8
- xlwt=1.2.0
# universal
- pytest>=4.0.2
- pytest>=4.0.2,<5.0.0
- pytest-xdist
- pytest-mock
- pytest-azurepipelines
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-slow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- xlsxwriter
- xlwt
# universal
- pytest>=4.0.2
- pytest>=4.0.2,<5.0.0
- pytest-xdist
- pytest-mock
- moto
Expand Down
2 changes: 1 addition & 1 deletion pandas/tests/resample/test_resample_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def test_agg_consistency():
check_stacklevel=False):
expected = r[['A', 'B', 'C']].agg({'r1': 'mean', 'r2': 'sum'})
result = r.agg({'r1': 'mean', 'r2': 'sum'})
assert_frame_equal(result, expected)
assert_frame_equal(result, expected, check_like=True)
Copy link
Contributor

Choose a reason for hiding this comment

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

LGTM. This could maybe be check_like=not compat.PY36 so that we continue to check it for 3.6 and above. But I suspect we have other tests ensuring the order.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah just saw a bunch of failures here.
Copy link
Member

Choose a reason for hiding this comment

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

Yeah, I think ideally we should only do this for py 3.5

# TODO: once GH 14008 is fixed, move these tests into
# `Base` test class
Expand Down