ddfc75ec64
### What changes were proposed in this pull request? Pass the raised `ImportError` on failing to import pandas/pyarrow. This will help the user identify whether pandas/pyarrow are indeed not in the environment or if they threw a different `ImportError`. ### Why are the changes needed? This can already happen in Pandas for example where it could throw an `ImportError` on its initialisation path if `dateutil` doesn't satisfy a certain version requirement https://github.com/pandas-dev/pandas/blob/0.24.x/pandas/compat/__init__.py#L438 ### Does this PR introduce _any_ user-facing change? Yes, it will now show the root cause of the exception when pandas or arrow is missing during import. ### How was this patch tested? Manually tested. ```python from pyspark.sql.functions import pandas_udf spark.range(1).select(pandas_udf(lambda x: x)) ``` Before: ``` Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/...//spark/python/pyspark/sql/pandas/functions.py", line 332, in pandas_udf require_minimum_pyarrow_version() File "/.../spark/python/pyspark/sql/pandas/utils.py", line 53, in require_minimum_pyarrow_version raise ImportError("PyArrow >= %s must be installed; however, " ImportError: PyArrow >= 1.0.0 must be installed; however, it was not found. ``` After: ``` Traceback (most recent call last): File "/.../spark/python/pyspark/sql/pandas/utils.py", line 49, in require_minimum_pyarrow_version import pyarrow ModuleNotFoundError: No module named 'pyarrow' The above exception was the direct cause of the following exception: Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/.../spark/python/pyspark/sql/pandas/functions.py", line 332, in pandas_udf require_minimum_pyarrow_version() File "/.../spark/python/pyspark/sql/pandas/utils.py", line 55, in require_minimum_pyarrow_version raise ImportError("PyArrow >= %s must be installed; however, " ImportError: PyArrow >= 1.0.0 must be installed; however, it was not found. ``` Closes #31902 from johnhany97/jayad/spark-34803. Lead-authored-by: John Ayad <johnhany97@gmail.com> Co-authored-by: John H. Ayad <johnhany97@gmail.com> Co-authored-by: HyukjinKwon <gurwls223@apache.org> Signed-off-by: HyukjinKwon <gurwls223@apache.org>
63 lines
2.7 KiB
Python
63 lines
2.7 KiB
Python
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright ownership.
|
|
# The ASF licenses this file to You under the Apache License, Version 2.0
|
|
# (the "License"); you may not use this file except in compliance with
|
|
# the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
|
|
|
|
def require_minimum_pandas_version():
|
|
""" Raise ImportError if minimum version of Pandas is not installed
|
|
"""
|
|
# TODO(HyukjinKwon): Relocate and deduplicate the version specification.
|
|
minimum_pandas_version = "0.23.2"
|
|
|
|
from distutils.version import LooseVersion
|
|
try:
|
|
import pandas
|
|
have_pandas = True
|
|
except ImportError as error:
|
|
have_pandas = False
|
|
raised_error = error
|
|
if not have_pandas:
|
|
raise ImportError("Pandas >= %s must be installed; however, "
|
|
"it was not found." % minimum_pandas_version) from raised_error
|
|
if LooseVersion(pandas.__version__) < LooseVersion(minimum_pandas_version):
|
|
raise ImportError("Pandas >= %s must be installed; however, "
|
|
"your version was %s." % (minimum_pandas_version, pandas.__version__))
|
|
|
|
|
|
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 = "1.0.0"
|
|
|
|
from distutils.version import LooseVersion
|
|
import os
|
|
try:
|
|
import pyarrow
|
|
have_arrow = True
|
|
except ImportError as error:
|
|
have_arrow = False
|
|
raised_error = error
|
|
if not have_arrow:
|
|
raise ImportError("PyArrow >= %s must be installed; however, "
|
|
"it was not found." % minimum_pyarrow_version) from raised_error
|
|
if LooseVersion(pyarrow.__version__) < LooseVersion(minimum_pyarrow_version):
|
|
raise ImportError("PyArrow >= %s must be installed; however, "
|
|
"your version was %s." % (minimum_pyarrow_version, pyarrow.__version__))
|
|
if os.environ.get("ARROW_PRE_0_15_IPC_FORMAT", "0") == "1":
|
|
raise RuntimeError("Arrow legacy IPC format is not supported in PySpark, "
|
|
"please unset ARROW_PRE_0_15_IPC_FORMAT")
|