From 8992760df75cb7b4537be3bc24d9937b349fa4b9 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 2 Jul 2019 18:45:43 -0400 Subject: [PATCH 1/4] TST: handle inconsistent ordering in resample_api compat test --- pandas/tests/resample/test_resample_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 9c1d7cd3f3a91fa45f3819a0d0338c356b2ec2e7 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 2 Jul 2019 21:06:15 -0400 Subject: [PATCH 2/4] limit pytest --- ci/deps/azure-36-locale_slow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 2bf2bd74795d2..18808989c182b 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -26,7 +26,7 @@ dependencies: - xlsxwriter - xlwt # universal - - pytest>=4.0.2 + - pytest>=4.0.2<5.0.0 - pytest-xdist - pytest-mock - pytest-azurepipelines From dde704dc47676eec68f50c67e903207ce0288b0b Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 2 Jul 2019 21:13:39 -0400 Subject: [PATCH 3/4] update spec --- ci/deps/azure-36-locale.yaml | 2 +- ci/deps/azure-36-locale_slow.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 18808989c182b..2bf2bd74795d2 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -26,7 +26,7 @@ dependencies: - xlsxwriter - xlwt # universal - - pytest>=4.0.2<5.0.0 + - pytest>=4.0.2 - pytest-xdist - pytest-mock - pytest-azurepipelines From 0bf2021f2ea5f9fdf16c03520d0e3168eff75b45 Mon Sep 17 00:00:00 2001 From: Jeff Reback Date: Tue, 2 Jul 2019 21:40:17 -0400 Subject: [PATCH 4/4] moar pytest < 5.0.0 --- ci/deps/travis-36-slow.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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