From 5f416f8322d608446723d8a6640e32e4fc76b993 Mon Sep 17 00:00:00 2001 From: Ali McMaster Date: Thu, 20 Aug 2020 22:26:04 +0100 Subject: [PATCH 1/3] Backport Pyarrow Min Versoin --- ci/deps/travis-36-locale.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 03a1e751b6a86..d2a0eb6f2d041 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -27,7 +27,12 @@ dependencies: - numpy - openpyxl - pandas-gbq=0.12.0 +<<<<<<< HEAD:ci/deps/travis-36-locale.yaml - psycopg2=2.6.2 +======= + - psycopg2=2.7 + - pyarrow>=0.15.0 # GH #35813 +>>>>>>> a67e988... Pyarrow Min Versoin (#35828):ci/deps/travis-37-locale.yaml - pymysql=0.7.11 - pytables - python-dateutil From e645abfe3877c6df940abf98d2aa3fa434d606a1 Mon Sep 17 00:00:00 2001 From: alimcmaster1 Date: Fri, 21 Aug 2020 00:23:32 +0100 Subject: [PATCH 2/3] Backport Pyarrow Min Versoin --- ci/deps/travis-36-locale.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index d2a0eb6f2d041..39e3100eddab7 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -27,12 +27,8 @@ dependencies: - numpy - openpyxl - pandas-gbq=0.12.0 -<<<<<<< HEAD:ci/deps/travis-36-locale.yaml - psycopg2=2.6.2 -======= - - psycopg2=2.7 - pyarrow>=0.15.0 # GH #35813 ->>>>>>> a67e988... Pyarrow Min Versoin (#35828):ci/deps/travis-37-locale.yaml - pymysql=0.7.11 - pytables - python-dateutil From 6e626b31ddf047133095b9d1e274e73c65fdac85 Mon Sep 17 00:00:00 2001 From: Ali McMaster Date: Fri, 21 Aug 2020 08:23:36 +0100 Subject: [PATCH 3/3] Update travis-36-locale.yaml --- ci/deps/travis-36-locale.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 39e3100eddab7..8f7e29abc5f3b 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -28,7 +28,7 @@ dependencies: - openpyxl - pandas-gbq=0.12.0 - psycopg2=2.6.2 - - pyarrow>=0.15.0 # GH #35813 + - pyarrow>=0.13.0 # GH #35813 - pymysql=0.7.11 - pytables - python-dateutil