From bbb588c3c653be5efb723304d95be3701fac905a Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 9 Sep 2019 07:19:50 +0200 Subject: [PATCH 1/3] Change conda channel order for Windows builds --- ci/deps/azure-windows-36.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index ff9264a36cb12..6f4467b2880ba 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -1,17 +1,15 @@ name: pandas-dev channels: - - defaults - conda-forge + - defaults dependencies: - blosc - bottleneck - - boost-cpp<1.67 - fastparquet>=0.2.1 - matplotlib=3.0.2 - numexpr - numpy=1.15.* - openpyxl - - parquet-cpp - pyarrow - pytables - python-dateutil From 1e101f2f46212507ddf32037453fb160a6b4acdb Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 11 Sep 2019 10:40:27 +0200 Subject: [PATCH 2/3] XFail on pyarrow 0.14 --- pandas/tests/io/test_parquet.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py index d634859e72d7b..21524d61907ad 100644 --- a/pandas/tests/io/test_parquet.py +++ b/pandas/tests/io/test_parquet.py @@ -238,6 +238,12 @@ def test_cross_engine_pa_fp(df_cross_compat, pa, fp): def test_cross_engine_fp_pa(df_cross_compat, pa, fp): # cross-compat with differing reading/writing engines + if pyarrow.__version__.startswith("0.14"): + pytest.xfail( + "Reading fastparquet with pyarrow in 0.14 fails: " + "https://issues.apache.org/jira/browse/ARROW-6492" + ) + df = df_cross_compat with tm.ensure_clean() as path: df.to_parquet(path, engine=fp, compression=None) From 84f95fe9c48027b096fd3c70a690fa47ecb3e912 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 11 Sep 2019 17:20:28 +0200 Subject: [PATCH 3/3] XFail for 0.13 too --- pandas/tests/io/test_parquet.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandas/tests/io/test_parquet.py b/pandas/tests/io/test_parquet.py index 21524d61907ad..9573ac15dc45f 100644 --- a/pandas/tests/io/test_parquet.py +++ b/pandas/tests/io/test_parquet.py @@ -1,5 +1,6 @@ """ test parquet compat """ import datetime +from distutils.version import LooseVersion import os from warnings import catch_warnings @@ -238,7 +239,10 @@ def test_cross_engine_pa_fp(df_cross_compat, pa, fp): def test_cross_engine_fp_pa(df_cross_compat, pa, fp): # cross-compat with differing reading/writing engines - if pyarrow.__version__.startswith("0.14"): + if ( + LooseVersion(pyarrow.__version__) < "0.15" + and LooseVersion(pyarrow.__version__) >= "0.13" + ): pytest.xfail( "Reading fastparquet with pyarrow in 0.14 fails: " "https://issues.apache.org/jira/browse/ARROW-6492"