Skip to content

[SPARK-56122][PS] Use pandas-aware numeric dtype check in Series.cov #54933

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
ueshin wants to merge 1 commit into from
Closed

[SPARK-56122][PS] Use pandas-aware numeric dtype check in Series.cov #54933

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions python/pyspark/pandas/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
from pandas.api.types import (
is_list_like,
is_hashable,
is_numeric_dtype,
CategoricalDtype,
)
from pandas.tseries.frequencies import DateOffset # type: ignore[attr-defined]
Expand Down Expand Up @@ -1092,9 +1093,9 @@ def cov(self, other: "Series", min_periods: Optional[int] = None, ddof: int = 1)
"""
if not isinstance(other, Series):
raise TypeError("unsupported type: %s" % type(other))
if not np.issubdtype(self.dtype, np.number): # type: ignore[arg-type]
if not is_numeric_dtype(self.dtype):
raise TypeError("unsupported dtype: %s" % self.dtype)
if not np.issubdtype(other.dtype, np.number): # type: ignore[arg-type]
if not is_numeric_dtype(other.dtype):
raise TypeError("unsupported dtype: %s" % other.dtype)
if not isinstance(ddof, int):
raise TypeError("ddof must be integer")
Expand Down
27 changes: 25 additions & 2 deletions python/pyspark/pandas/tests/series/test_stat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,9 +630,9 @@ def test_cov(self):
index=[0, 1, 2],
)
psdf = ps.from_pandas(pdf)
with self.assertRaisesRegex(TypeError, "unsupported dtype: object"):
with self.assertRaisesRegex(TypeError, "unsupported dtype: (object|str)"):
psdf["s1"].cov(psdf["s2"])
with self.assertRaisesRegex(TypeError, "unsupported dtype: object"):
with self.assertRaisesRegex(TypeError, "unsupported dtype: (object|str)"):
psdf["s2"].cov(psdf["s1"])
with self.assertRaisesRegex(TypeError, "ddof must be integer"):
psdf["s2"].cov(psdf["s2"], ddof="ddof")
Expand All @@ -655,6 +655,29 @@ def test_cov(self):
)
self._test_cov(pdf)

# Extension Dtypes
pdf = pd.DataFrame(
{
"s1": pd.Series([0.90010907, None, 0.13484424, 0.62036035], dtype="Float64"),
"s2": pd.Series([0.12528585, 0.81131178, 0.26962463, 0.51111198], dtype="Float64"),
},
index=[0, 1, 2, 3],
)
self._test_cov(pdf)

pdf = pd.DataFrame(
{
"s1": pd.Series(["a", "b", "c"], dtype="string"),
"s2": pd.Series([0.12528585, 0.26962463, 0.51111198], dtype="Float64"),
},
index=[0, 1, 2],
)
psdf = ps.from_pandas(pdf)
with self.assertRaisesRegex(TypeError, "unsupported dtype: (object|str)"):
psdf["s1"].cov(psdf["s2"])
with self.assertRaisesRegex(TypeError, "unsupported dtype: (object|str)"):
psdf["s2"].cov(psdf["s1"])

def _test_cov(self, pdf):
psdf = ps.from_pandas(pdf)

Expand Down