Skip to content

Commit

Permalink
fix: add missing pandas import
Browse files Browse the repository at this point in the history
  • Loading branch information
Tim Haarman committed Jan 23, 2024
1 parent 1a984ce commit 479efe1
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions python/deltalake/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
if TYPE_CHECKING:
import os

import pandas

from deltalake._internal import DeltaDataChecker as _DeltaDataChecker
from deltalake._internal import RawDeltaTable
from deltalake._internal import create_deltalake as _create_deltalake
Expand All @@ -48,6 +46,13 @@
from deltalake.fs import DeltaStorageHandler
from deltalake.schema import Schema as DeltaSchema

try:
import pandas as pd # noqa: F811
except ModuleNotFoundError:
_has_pandas = False
else:
_has_pandas = True

MAX_SUPPORTED_READER_VERSION = 1
MAX_SUPPORTED_WRITER_VERSION = 2

Expand Down Expand Up @@ -893,7 +898,7 @@ def merge(
pyarrow.RecordBatch,
pyarrow.RecordBatchReader,
ds.Dataset,
"pandas.DataFrame",
"pd.DataFrame",
],
predicate: str,
source_alias: Optional[str] = None,
Expand Down Expand Up @@ -938,7 +943,7 @@ def merge(
source = convert_pyarrow_table(source, large_dtypes)
elif isinstance(source, ds.Dataset):
source = convert_pyarrow_dataset(source, large_dtypes)
elif isinstance(source, pandas.DataFrame):
elif _has_pandas and isinstance(source, pd.DataFrame):
source = convert_pyarrow_table(
pyarrow.Table.from_pandas(source), large_dtypes
)
Expand Down Expand Up @@ -1095,7 +1100,7 @@ def to_pandas(
columns: Optional[List[str]] = None,
filesystem: Optional[Union[str, pa_fs.FileSystem]] = None,
filters: Optional[FilterType] = None,
) -> "pandas.DataFrame":
) -> "pd.DataFrame":
"""
Build a pandas dataframe using data from the DeltaTable.
Expand Down

0 comments on commit 479efe1

Please sign in to comment.