Skip to content

Commit 7ab9ff5

Browse files
authored
TST: handle inconsistent ordering in resample_api compat test (#27196)
1 parent c407b73 commit 7ab9ff5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ci/deps/azure-36-locale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
- xlsxwriter=0.9.8
2121
- xlwt=1.2.0
2222
# universal
23-
- pytest>=4.0.2
23+
- pytest>=4.0.2,<5.0.0
2424
- pytest-xdist
2525
- pytest-mock
2626
- pytest-azurepipelines

ci/deps/travis-36-slow.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies:
2525
- xlsxwriter
2626
- xlwt
2727
# universal
28-
- pytest>=4.0.2
28+
- pytest>=4.0.2,<5.0.0
2929
- pytest-xdist
3030
- pytest-mock
3131
- moto

pandas/tests/resample/test_resample_api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ def test_agg_consistency():
247247
check_stacklevel=False):
248248
expected = r[['A', 'B', 'C']].agg({'r1': 'mean', 'r2': 'sum'})
249249
result = r.agg({'r1': 'mean', 'r2': 'sum'})
250-
assert_frame_equal(result, expected)
250+
assert_frame_equal(result, expected, check_like=True)
251251

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

0 commit comments

Comments
 (0)