Skip to content

REGR: preserve reindexed array object (instead of creating new array) for concat with all-NA array #47762

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

Merged
merged 15 commits into from
Aug 30, 2022
Merged

REGR: preserve reindexed array object (instead of creating new array) for concat with all-NA array #47762

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e89624f
REGR: preserve array object for concat with all-NA array
jorisvandenbossche Jul 17, 2022
7bc3b64
update PR number
jorisvandenbossche Jul 17, 2022
a5ae544
Merge remote-tracking branch 'upstream/main' into regr-concat-preserv…
jorisvandenbossche Aug 12, 2022
40e1009
Merge remote-tracking branch 'upstream/main' into regr-concat-preserv…
jorisvandenbossche Aug 20, 2022
e5e19b8
Merge remote-tracking branch 'upstream/main' into regr-concat-preserv…
jorisvandenbossche Aug 23, 2022
c42f54e
additional test
jorisvandenbossche Aug 23, 2022
d76aa6f
use is_dtype_equal for compat with old numpy
jorisvandenbossche Aug 23, 2022
28d72a3
Merge remote-tracking branch 'upstream/main' into regr-concat-preserv…
jorisvandenbossche Aug 23, 2022
3679d63
Merge remote-tracking branch 'upstream/main' into regr-concat-preserv…
jorisvandenbossche Aug 25, 2022
2e0e0a8
EA specific, simplify tests
jorisvandenbossche Aug 25, 2022
12d8480
fixup
jorisvandenbossche Aug 25, 2022
83b1ea9
fixup
jorisvandenbossche Aug 25, 2022
2da56d5
Merge remote-tracking branch 'upstream/main' into regr-concat-preserv…
jorisvandenbossche Aug 26, 2022
bfba49c
Merge branch 'main' into regr-concat-preserve-array-obj
simonjayhawkins Aug 26, 2022
7f25c24
Merge branch 'main' into regr-concat-preserve-array-obj
simonjayhawkins Aug 30, 2022
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
fixup
  • Loading branch information
@jorisvandenbossche
jorisvandenbossche committed Aug 25, 2022
commit 12d848098f761efd49acedae6dd1317f8464fc4d
2 changes: 1 addition & 1 deletion pandas/tests/extension/array_with_attr/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
FloatAttrDtype,
)

__all__ = ["FloatAttrArray", "FloatAttrDtype", "make_data"]
__all__ = ["FloatAttrArray", "FloatAttrDtype"]
2 changes: 1 addition & 1 deletion pandas/tests/extension/array_with_attr/test_array_with_attr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def test_concat_with_all_na():

result = pd.concat([df1.set_index("key"), df2.set_index("key")], axis=1)
expected = pd.DataFrame(
{"col": arr.take([0, 0, 1]), "col2": [1, np.nan, 2], "key": [0, 1, 2]}
{"col": arr.take([0, 1, -1]), "col2": [1, np.nan, 2], "key": [0, 1, 2]}
).set_index("key")
tm.assert_frame_equal(result, expected)
assert result["col"].array.attr == "test"