Skip to content
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

Jump to bottom

String dtype: fix convert_dtypes() to convert NaN-string to NA-string #59470

Merged
merged 3 commits into from
Aug 12, 2024
Merged

String dtype: fix convert_dtypes() to convert NaN-string to NA-string #59470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9c5d20
String dtype: fix convert_dtypes() to convert NaN-string to NA-string
jorisvandenbossche Aug 10, 2024
40185d3
fix CoW tracking for conversion to python storage strings
jorisvandenbossche Aug 10, 2024
a843351
remove xfails
jorisvandenbossche Aug 10, 2024
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
9 changes: 9 additions & 0 deletions pandas/core/dtypes/cast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,6 +1025,8 @@ def convert_dtypes(
-------
np.dtype, or ExtensionDtype
"""
from pandas.core.arrays.string_ import StringDtype

inferred_dtype: str | DtypeObj

if (
Expand Down Expand Up @@ -1103,6 +1105,13 @@ def convert_dtypes(
# If we couldn't do anything else, then we retain the dtype
inferred_dtype = input_array.dtype

elif (
convert_string
and isinstance(input_array.dtype, StringDtype)
and input_array.dtype.na_value is np.nan
):
inferred_dtype = pandas_dtype_func("string")

else:
inferred_dtype = input_array.dtype

Expand Down
6 changes: 5 additions & 1 deletion pandas/core/internals/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,11 @@ def convert(self) -> list[Block]:
convert_non_numeric=True,
)
refs = None
if res_values is values:
if (
res_values is values
or isinstance(res_values, NumpyExtensionArray)
and res_values._ndarray is values
):
refs = self.refs

res_values = ensure_block_shape(res_values, self.ndim)
Expand Down
10 changes: 1 addition & 9 deletions pandas/tests/frame/methods/test_convert_dtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,15 @@
import numpy as np
import pytest

from pandas._config import using_string_dtype

import pandas as pd
import pandas._testing as tm


class TestConvertDtypes:
# TODO convert_dtypes should not use NaN variant of string dtype, but always NA
@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
@pytest.mark.parametrize(
"convert_integer, expected", [(False, np.dtype("int32")), (True, "Int32")]
)
def test_convert_dtypes(
self, convert_integer, expected, string_storage, using_infer_string
):
def test_convert_dtypes(self, convert_integer, expected, string_storage):
# Specific types are tested in tests/series/test_dtypes.py
# Just check that it works for DataFrame here
df = pd.DataFrame(
Expand Down Expand Up @@ -182,7 +176,6 @@ def test_convert_dtypes_pyarrow_timestamp(self):
result = expected.convert_dtypes(dtype_backend="pyarrow")
tm.assert_series_equal(result, expected)

@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
def test_convert_dtypes_avoid_block_splitting(self):
# GH#55341
df = pd.DataFrame({"a": [1, 2, 3], "b": [4, 5, 6], "c": "a"})
Expand All @@ -197,7 +190,6 @@ def test_convert_dtypes_avoid_block_splitting(self):
tm.assert_frame_equal(result, expected)
assert result._mgr.nblocks == 2

@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
def test_convert_dtypes_from_arrow(self):
# GH#56581
df = pd.DataFrame([["a", datetime.time(18, 12)]], columns=["a", "b"])
Expand Down
2 changes: 0 additions & 2 deletions pandas/tests/io/parser/dtypes/test_dtypes_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@ def test_dtype_backend_and_dtype(all_parsers):
tm.assert_frame_equal(result, expected)


@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)", strict=False)
def test_dtype_backend_string(all_parsers, string_storage):
# GH#36712
pa = pytest.importorskip("pyarrow")
Expand Down Expand Up @@ -507,7 +506,6 @@ def test_dtype_backend_ea_dtype_specified(all_parsers):
tm.assert_frame_equal(result, expected)


@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)", strict=False)
def test_dtype_backend_pyarrow(all_parsers, request):
# GH#36712
pa = pytest.importorskip("pyarrow")
Expand Down
9 changes: 3 additions & 6 deletions pandas/tests/series/methods/test_convert_dtypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
import numpy as np
import pytest

from pandas._config import using_string_dtype

from pandas._libs import lib

import pandas as pd
import pandas._testing as tm


class TestSeriesConvertDtypes:
@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)", strict=False)
@pytest.mark.parametrize(
"data, maindtype, expected_default, expected_other",
[
Expand Down Expand Up @@ -223,9 +220,9 @@ def test_convert_dtypes(
and params[0]
and not params[1]
):
# If we would convert with convert strings then infer_objects converts
# with the option
expected_dtype = "string[pyarrow_numpy]"
# If convert_string=False and infer_objects=True, we end up with the
# default string dtype instead of preserving object for string data
expected_dtype = pd.StringDtype(na_value=np.nan)

expected = pd.Series(data, dtype=expected_dtype)
tm.assert_series_equal(result, expected)
Expand Down