diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index 99fa4d5c9e160..8f8273f57c3fe 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -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 diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml index 87021d5dae04e..538a82f66e4c8 100644 --- a/ci/deps/travis-36-slow.yaml +++ b/ci/deps/travis-36-slow.yaml @@ -25,7 +25,7 @@ dependencies: - xlsxwriter - xlwt # universal - - pytest>=4.0.2 + - pytest>=4.0.2,<5.0.0 - pytest-xdist - pytest-mock - moto diff --git a/pandas/tests/resample/test_resample_api.py b/pandas/tests/resample/test_resample_api.py index ca2fb1acb6afa..6943d30276a21 100644 --- a/pandas/tests/resample/test_resample_api.py +++ b/pandas/tests/resample/test_resample_api.py @@ -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) # TODO: once GH 14008 is fixed, move these tests into # `Base` test class