Skip to content

[WIP][SPARK-40353][PS][TESTS] Re-enable the read_excel tests #44238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
itholic wants to merge 1 commit into from
Closed

[WIP][SPARK-40353][PS][TESTS] Re-enable the read_excel tests #44238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 16 additions & 21 deletions python/pyspark/pandas/tests/test_dataframe_spark_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,6 @@ def test_spark_io(self):
expected_idx.sort_values(by="f").to_spark().toPandas(),
)

# TODO(SPARK-40353): re-enabling the `test_read_excel`.
@unittest.skip("openpyxl")
def test_read_excel(self):
with self.temp_dir() as tmp:
path1 = "{}/file1.xlsx".format(tmp)
Expand All @@ -266,15 +264,18 @@ def test_read_excel(self):
pd.read_excel(open(path1, "rb"), index_col=0),
)
self.assert_eq(
ps.read_excel(open(path1, "rb"), index_col=0, squeeze=True),
pd.read_excel(open(path1, "rb"), index_col=0, squeeze=True),
ps.read_excel(
open(path1, "rb"),
index_col=0,
),
pd.read_excel(open(path1, "rb"), index_col=0),
)

self.assert_eq(ps.read_excel(path1), pd.read_excel(path1))
self.assert_eq(ps.read_excel(path1, index_col=0), pd.read_excel(path1, index_col=0))
self.assert_eq(
ps.read_excel(path1, index_col=0, squeeze=True),
pd.read_excel(path1, index_col=0, squeeze=True),
ps.read_excel(path1, index_col=0),
pd.read_excel(path1, index_col=0),
)

self.assert_eq(ps.read_excel(tmp), pd.read_excel(path1))
Expand All @@ -288,11 +289,11 @@ def test_read_excel(self):
).sort_index(),
)
self.assert_eq(
ps.read_excel(tmp, index_col=0, squeeze=True).sort_index(),
ps.read_excel(tmp, index_col=0).sort_index(),
pd.concat(
[
pd.read_excel(path1, index_col=0, squeeze=True),
pd.read_excel(path2, index_col=0, squeeze=True),
pd.read_excel(path1, index_col=0),
pd.read_excel(path2, index_col=0),
]
).sort_index(),
)
Expand All @@ -306,18 +307,14 @@ def test_read_excel(self):
sheet_names = [["Sheet_name_1", "Sheet_name_2"], None]

pdfs1 = pd.read_excel(open(path1, "rb"), sheet_name=None, index_col=0)
pdfs1_squeezed = pd.read_excel(
open(path1, "rb"), sheet_name=None, index_col=0, squeeze=True
)
pdfs1_squeezed = pd.read_excel(open(path1, "rb"), sheet_name=None, index_col=0)

for sheet_name in sheet_names:
psdfs = ps.read_excel(open(path1, "rb"), sheet_name=sheet_name, index_col=0)
self.assert_eq(psdfs["Sheet_name_1"], pdfs1["Sheet_name_1"])
self.assert_eq(psdfs["Sheet_name_2"], pdfs1["Sheet_name_2"])

psdfs = ps.read_excel(
open(path1, "rb"), sheet_name=sheet_name, index_col=0, squeeze=True
)
psdfs = ps.read_excel(open(path1, "rb"), sheet_name=sheet_name, index_col=0)
self.assert_eq(psdfs["Sheet_name_1"], pdfs1_squeezed["Sheet_name_1"])
self.assert_eq(psdfs["Sheet_name_2"], pdfs1_squeezed["Sheet_name_2"])

Expand All @@ -331,7 +328,7 @@ def test_read_excel(self):
self.assert_eq(psdfs["Sheet_name_1"], pdfs1["Sheet_name_1"])
self.assert_eq(psdfs["Sheet_name_2"], pdfs1["Sheet_name_2"])

psdfs = ps.read_excel(tmp, sheet_name=sheet_name, index_col=0, squeeze=True)
psdfs = ps.read_excel(tmp, sheet_name=sheet_name, index_col=0)
self.assert_eq(psdfs["Sheet_name_1"], pdfs1_squeezed["Sheet_name_1"])
self.assert_eq(psdfs["Sheet_name_2"], pdfs1_squeezed["Sheet_name_2"])

Expand All @@ -341,16 +338,14 @@ def test_read_excel(self):
self.test_pdf[["i32"]].to_excel(writer, sheet_name="Sheet_name_2")

pdfs2 = pd.read_excel(path2, sheet_name=None, index_col=0)
pdfs2_squeezed = pd.read_excel(path2, sheet_name=None, index_col=0, squeeze=True)
pdfs2_squeezed = pd.read_excel(path2, sheet_name=None, index_col=0)

self.assert_eq(
ps.read_excel(tmp, sheet_name="Sheet_name_2", index_col=0).sort_index(),
pd.concat([pdfs1["Sheet_name_2"], pdfs2["Sheet_name_2"]]).sort_index(),
)
self.assert_eq(
ps.read_excel(
tmp, sheet_name="Sheet_name_2", index_col=0, squeeze=True
).sort_index(),
ps.read_excel(tmp, sheet_name="Sheet_name_2", index_col=0).sort_index(),
pd.concat(
[pdfs1_squeezed["Sheet_name_2"], pdfs2_squeezed["Sheet_name_2"]]
).sort_index(),
Expand All @@ -367,7 +362,7 @@ def test_read_excel(self):
pd.concat([pdfs1["Sheet_name_2"], pdfs2["Sheet_name_2"]]).sort_index(),
)

psdfs = ps.read_excel(tmp, sheet_name=sheet_name, index_col=0, squeeze=True)
psdfs = ps.read_excel(tmp, sheet_name=sheet_name, index_col=0)
self.assert_eq(
psdfs["Sheet_name_1"].sort_index(),
pd.concat(
Expand Down