From 4b8555cddc5ec8a5f764a863821edbf4b5506b9a Mon Sep 17 00:00:00 2001 From: Bryan Cutler Date: Mon, 4 Nov 2019 17:41:10 -0800 Subject: [PATCH] Update to use Arrow 0.15.1 --- dev/deps/spark-deps-hadoop-2.7 | 7 +++---- dev/deps/spark-deps-hadoop-3.2 | 7 +++---- pom.xml | 2 +- python/pyspark/sql/utils.py | 2 +- python/setup.py | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dev/deps/spark-deps-hadoop-2.7 b/dev/deps/spark-deps-hadoop-2.7 index e6d29d04acbf3..54608d203133c 100644 --- a/dev/deps/spark-deps-hadoop-2.7 +++ b/dev/deps/spark-deps-hadoop-2.7 @@ -17,9 +17,9 @@ apacheds-kerberos-codec-2.0.0-M15.jar api-asn1-api-1.0.0-M20.jar api-util-1.0.0-M20.jar arpack_combined_all-0.1.jar -arrow-format-0.12.0.jar -arrow-memory-0.12.0.jar -arrow-vector-0.12.0.jar +arrow-format-0.15.1.jar +arrow-memory-0.15.1.jar +arrow-vector-0.15.1.jar audience-annotations-0.5.0.jar automaton-1.11-8.jar avro-1.8.2.jar @@ -83,7 +83,6 @@ hadoop-yarn-server-web-proxy-2.7.4.jar hk2-api-2.5.0.jar hk2-locator-2.5.0.jar hk2-utils-2.5.0.jar -hppc-0.7.2.jar htrace-core-3.1.0-incubating.jar httpclient-4.5.6.jar httpcore-4.4.10.jar diff --git a/dev/deps/spark-deps-hadoop-3.2 b/dev/deps/spark-deps-hadoop-3.2 index 8f1e7fe125b9f..917fde61fad1a 100644 --- a/dev/deps/spark-deps-hadoop-3.2 +++ b/dev/deps/spark-deps-hadoop-3.2 @@ -12,9 +12,9 @@ antlr4-runtime-4.7.1.jar aopalliance-1.0.jar aopalliance-repackaged-2.5.0.jar arpack_combined_all-0.1.jar -arrow-format-0.12.0.jar -arrow-memory-0.12.0.jar -arrow-vector-0.12.0.jar +arrow-format-0.15.1.jar +arrow-memory-0.15.1.jar +arrow-vector-0.15.1.jar audience-annotations-0.5.0.jar automaton-1.11-8.jar avro-1.8.2.jar @@ -96,7 +96,6 @@ hive-vector-code-gen-2.3.6.jar hk2-api-2.5.0.jar hk2-locator-2.5.0.jar hk2-utils-2.5.0.jar -hppc-0.7.2.jar htrace-core4-4.1.0-incubating.jar httpclient-4.5.6.jar httpcore-4.4.10.jar diff --git a/pom.xml b/pom.xml index 0009bbb8f2e4d..a6a82b3339d08 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ If you are changing Arrow version specification, please check ./python/pyspark/sql/utils.py, and ./python/setup.py too. --> - 0.15.0 + 0.15.1 ${java.home} diff --git a/python/pyspark/sql/utils.py b/python/pyspark/sql/utils.py index a203f140303ab..4260c06f06060 100644 --- a/python/pyspark/sql/utils.py +++ b/python/pyspark/sql/utils.py @@ -160,7 +160,7 @@ def require_minimum_pyarrow_version(): """ Raise ImportError if minimum version of pyarrow is not installed """ # TODO(HyukjinKwon): Relocate and deduplicate the version specification. - minimum_pyarrow_version = "0.15.0" + minimum_pyarrow_version = "0.15.1" from distutils.version import LooseVersion import os diff --git a/python/setup.py b/python/setup.py index 03a46ca46144b..138161ff13b41 100755 --- a/python/setup.py +++ b/python/setup.py @@ -105,7 +105,7 @@ def _supports_symlinks(): # For Arrow, you should also check ./pom.xml and ensure there are no breaking changes in the # binary format protocol with the Java version, see ARROW_HOME/format/* for specifications. _minimum_pandas_version = "0.23.2" -_minimum_pyarrow_version = "0.15.0" +_minimum_pyarrow_version = "0.15.1" try: # We copy the shell script to be under pyspark/python/pyspark so that the launcher scripts