8000 ENH: nullable Float32/64 ExtensionArray by jorisvandenbossche · Pull Request #34307 · pandas-dev/pandas · GitHub
[go: up one dir, main page]

Skip to content

ENH: nullable Float32/64 ExtensionArray #34307

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

Merged
merged 35 commits into from
Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cddc939
ENH: nullable Float32/64 ExtensionArray
jorisvandenbossche May 15, 2020
6a1d822
fix doctest
jorisvandenbossche May 22, 2020
f43f021
add basic whatsnew note
jorisvandenbossche May 22, 2020
ffdd65c
typo
jorisvandenbossche May 22, 2020
3d189f9
Merge remote-tracking branch 'upstream/master' into EA-floating
jorisvandenbossche May 29, 2020
ff3b937
fix astype to string
jorisvandenbossche May 29, 2020
13b8281
Merge remote-tracking branch 'upstream/master' into EA-floating
jorisvandenbossche Jun 15, 2020
4c1d06c
Merge remote-tracking branch 'upstream/master' into EA-floating
jorisvandenbossche Jun 19, 2020
ebbc64d
clean-up arithmetic tests to align with integer/boolean tests
jorisvandenbossche Jun 19, 2020
94be5f2
Merge remote-tracking branch 'upstream/master' into EA-floating
jorisvandenbossche Jun 22, 2020
8000 8cf0d47
updates for feedback
jorisvandenbossche Jun 22, 2020
f7cc1be
fix string array construction
jorisvandenbossche Jun 22, 2020
107b083
fix mypy
jorisvandenbossche Jun 22, 2020
ba1e62c
Merge remote-tracking branch 'upstream/master' into EA-floating
jorisvandenbossche Jul 3, 2020
879d3e0
Merge remote-tracking branch 'upstream/master' into EA-floating
jorisvandenbossche Jul 11, 2020
ed9a14b
rename _FloatingDtype -> FloatingDtype
jorisvandenbossche Jul 11, 2020
c16ca4c
update astype implementation to follow IntegerArray changes
jorisvandenbossche Jul 11, 2020
aa45aac
clean-up tests
jorisvandenbossche Jul 11, 2020
25eb1ba
remove usage of deprecated check_less_precise
jorisvandenbossche Jul 12, 2020
b78c041
Merge remote-tracking branch 'upstream/master' into EA-floating
jorisvandenbossche Sep 18, 2020
45b98f2
fixup merge + skip astype(string) for float32
jorisvandenbossche Sep 18, 2020
314b6a9
linting
jorisvandenbossche Sep 18, 2020
a157806
add back type ignore
jorisvandenbossche Sep 18, 2020
81456f9
whatsnew 1.2
jorisvandenbossche Sep 19, 2020
71009c3
update whatsnew
jorisvandenbossche Sep 19, 2020
56d2311
add fixture
jorisvandenbossche Sep 19, 2020
65a2060
share some dtype properties
jorisvandenbossche Sep 19, 2020
8b36098
update ensure_float
jorisvandenbossche Sep 19, 2020
7f3e965
Merge remote-tracking branch 'upstream/master' into EA-floating
jorisvandenbossche Sep 23, 2020
66d6939
remove skip for float32 conversion to string
jorisvandenbossche Sep 23, 2020
e0c9d9a
Merge remote-tracking branch 'upstream/master' into EA-floating
jorisvandenbossche Sep 29, 2020
d37b815
code formatting
jorisvandenbossche Sep 29, 2020
44e699a
Update doc/source/whatsnew/v1.2.0.rst
jorisvandenbossche Sep 30, 2020
b42b61d
Update pandas/core/arrays/floating.py
jorisvandenbossche Sep 30, 2020
edf9618
ignore mypy bug
jorisvandenbossche Sep 30, 2020
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
Prev Previous commit
Next Next commit
clean-up tests
  • Loading branch information
jorisvandenbossche committed Jul 11, 2020
commit aa45aac1bb16dbfab6bd612c7dab868065fb9eb0
11 changes: 11 additions & 0 deletions pandas/tests/arrays/floating/test_astype.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,14 @@ def test_astype_copy():
tm.assert_extension_array_equal(arr, orig)
result[0] = pd.NA
tm.assert_extension_array_equal(arr, orig)


def test_astype_object(dtype):
arr = pd.array([1.0, pd.NA], dtype=dtype)

result = arr.astype(object)
expected = np.array([1.0, pd.NA], dtype=object)
tm.assert_numpy_array_equal(result, expected)
# check exact element types
assert isinstance(result[0], float)
assert result[1] is pd.NA
54 changes: 0 additions & 54 deletions pandas/tests/arrays/floating/test_construction.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import numpy as np
import pytest

import pandas.util._test_decorators as td

import pandas as pd
import pandas._testing as tm
from pandas.core.arrays import FloatingArray
Expand Down Expand Up @@ -167,55 +165,3 @@ def test_series_from_float(data):
expected = pd.Series(data)
result = pd.Series(np.array(data).tolist(), dtype=str(dtype))
tm.assert_series_equal(result, expected)


# TODO belongs in different file

# def test_conversions(data_missing):

# # astype to object series
# df = pd.DataFrame({"A": data_missing})
# result = df["A"].astype("object")
# expected = pd.Series(np.array([np.nan, 1], dtype=object), name="A")
# tm.assert_series_equal(result, expected)

# # convert to object ndarray
# # we assert that we are exactly equal
# # including type conversions of scalars
# result = df["A"].astype("object").values
# expected = np.array([pd.NA, 1], dtype=object)
# tm.assert_numpy_array_equal(result, expected)

# for r, e in zip(result, expected):
# if pd.isnull(r):
# assert pd.isnull(e)
# elif is_integer(r):
# assert r == e
# assert is_integer(e)
# else:
# assert r == e
# assert type(r) == type(e)


@td.skip_if_no("pyarrow", min_version="0.15.0")
def test_arrow_array(data):
# protocol added in 0.15.0
import pyarrow as pa

arr = pa.array(data)
expected = np.array(data, dtype=object)
expected[data.isna()] = None
expected = pa.array(expected, type=data.dtype.name.lower(), from_pandas=True)
assert arr.equals(expected)


@td.skip_if_no("pyarrow", min_version="0.16.0")
def test_arrow_roundtrip(data):
# roundtrip possible from arrow 0.16.0
import pyarrow as pa

df = pd.DataFrame({"a": data})
table = pa.table(df)
assert table.field("a").type == str(data.dtype.numpy_dtype)
result = table.to_pandas()
tm.assert_frame_equal(result, df)
1 change: 1 addition & 0 deletions pandas/tests/arrays/masked/test_arrow_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import pandas._testing as tm

arrays = [pd.array([1, 2, 3, None], dtype=dtype) for dtype in tm.ALL_EA_INT_DTYPES]
48AB arrays += [pd.array([0.1, 0.2, 0.3, None], dtype=dtype) for dtype in tm.FLOAT_EA_DTYPES]
arrays += [pd.array([True, False, True, None], dtype="boolean")]


Expand Down
0