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.

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

String dtype: implement object-dtype based StringArray variant with NumPy semantics #58451

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
63a7fc5
String dtype: implement object-dtype based StringArray variant with N…
jorisvandenbossche Apr 27, 2024
0eee625
fix constructor to not convert to NA
jorisvandenbossche Apr 27, 2024
607b95e
fix typing
jorisvandenbossche Apr 27, 2024
bca157d
improve logic in str_map
jorisvandenbossche Apr 27, 2024
79eb3b4
Merge remote-tracking branch 'upstream/main' into string-dtype-object
jorisvandenbossche Jul 26, 2024
c063298
Merge remote-tracking branch 'upstream/main' into string-dtype-object
jorisvandenbossche Jul 30, 2024
ab96aa4
remove most usage of python_numpy
jorisvandenbossche Jul 30, 2024
bae8d65
update tests to avoid string[python_numpy]
jorisvandenbossche Jul 30, 2024
31f1c33
Merge remote-tracking branch 'upstream/main' into string-dtype-object
jorisvandenbossche Jul 31, 2024
cbd0820
Merge remote-tracking branch 'upstream/main' into string-dtype-object
jorisvandenbossche Aug 1, 2024
864c166
remove all python_numpy usage
jorisvandenbossche Aug 1, 2024
d3ad7b0
remove hardcoded storage
jorisvandenbossche Aug 2, 2024
028dc2c
implement any/all reductions
jorisvandenbossche Aug 2, 2024
1750bcb
Merge remote-tracking branch 'upstream/main' into string-dtype-object
jorisvandenbossche Aug 3, 2024
7f4baf7
fix typing
jorisvandenbossche Aug 3, 2024
fdf1454
Merge remote-tracking branch 'upstream/main' into string-dtype-object
jorisvandenbossche Aug 7, 2024
fe6fce6
Update pandas/core/arrays/string_.py
jorisvandenbossche Aug 7, 2024
70325d4
update todo comment
jorisvandenbossche Aug 7, 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
2 changes: 1 addition & 1 deletion pandas/_libs/lib.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -2702,7 +2702,7 @@ def maybe_convert_objects(ndarray[object] objects,
if using_string_dtype() and is_string_array(objects, skipna=True):
from pandas.core.arrays.string_ import StringDtype

dtype = StringDtype(storage="pyarrow", na_value=np.nan)
dtype = StringDtype(na_value=np.nan)
return dtype.construct_array_type()._from_sequence(objects, dtype=dtype)

elif convert_to_nullable_dtype and is_string_array(objects, skipna=True):
Expand Down
18 changes: 18 additions & 0 deletions pandas/_testing/asserters.py
Original file line number Diff line number Diff line change
Expand Up @@ -796,6 +796,24 @@ def assert_extension_array_equal(
left_na, right_na, obj=f"{obj} NA mask", index_values=index_values
)

# Specifically for StringArrayNumpySemantics, validate here we have a valid array
if (
isinstance(left.dtype, StringDtype)
and left.dtype.storage == "python"
and left.dtype.na_value is np.nan
):
assert np.all(
[np.isnan(val) for val in left._ndarray[left_na]] # type: ignore[attr-defined]
), "wrong missing value sentinels"
if (
isinstance(right.dtype, StringDtype)
and right.dtype.storage == "python"
and right.dtype.na_value is np.nan
):
assert np.all(
[np.isnan(val) for val in right._ndarray[right_na]] # type: ignore[attr-defined]
), "wrong missing value sentinels"

left_valid = left[~left_na].to_numpy(dtype=object)
right_valid = right[~right_na].to_numpy(dtype=object)
if check_exact:
Expand Down
2 changes: 2 additions & 0 deletions pandas/compat/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
)
from pandas.compat.numpy import is_numpy_dev
from pandas.compat.pyarrow import (
HAS_PYARROW,
pa_version_under10p1,
pa_version_under11p0,
pa_version_under13p0,
Expand Down Expand Up @@ -156,6 +157,7 @@ def is_ci_environment() -> bool:
"pa_version_under14p1",
"pa_version_under16p0",
"pa_version_under17p0",
"HAS_PYARROW",
"IS64",
"ISMUSL",
"PY311",
Expand Down
2 changes: 2 additions & 0 deletions pandas/compat/pyarrow.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
pa_version_under15p0 = _palv < Version("15.0.0")
pa_version_under16p0 = _palv < Version("16.0.0")
pa_version_under17p0 = _palv < Version("17.0.0")
HAS_PYARROW = True
except ImportError:
pa_version_under10p1 = True
pa_version_under11p0 = True
Expand All @@ -27,3 +28,4 @@
pa_version_under15p0 = True
pa_version_under16p0 = True
pa_version_under17p0 = True
HAS_PYARROW = False
4 changes: 4 additions & 0 deletions pandas/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -1313,6 +1313,7 @@ def string_storage(request):
("python", pd.NA),
pytest.param(("pyarrow", pd.NA), marks=td.skip_if_no("pyarrow")),
pytest.param(("pyarrow", np.nan), marks=td.skip_if_no("pyarrow")),
("python", np.nan),
]
)
def string_dtype_arguments(request):
Expand Down Expand Up @@ -1374,12 +1375,14 @@ def object_dtype(request):
("python", pd.NA),
pytest.param(("pyarrow", pd.NA), marks=td.skip_if_no("pyarrow")),
pytest.param(("pyarrow", np.nan), marks=td.skip_if_no("pyarrow")),
("python", np.nan),
],
ids=[
"string=object",
"string=string[python]",
"string=string[pyarrow]",
"string=str[pyarrow]",
"string=str[python]",
],
)
def any_string_dtype(request):
Expand All @@ -1389,6 +1392,7 @@ def any_string_dtype(request):
* 'string[python]' (NA variant)
* 'string[pyarrow]' (NA variant)
* 'str' (NaN variant, with pyarrow)
* 'str' (NaN variant, without pyarrow)
"""
if isinstance(request.param, np.dtype):
return request.param
Expand Down
Loading
Loading