8000 regression fix for merging DF with datetime index with empty DF by PCerles · Pull Request #36897 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

regression fix for merging DF with datetime index with empty DF #36897

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 17 commits into from
Nov 3, 2020
Merged

regression fix for merging DF with datetime index with empty DF #36897

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
16a7844
possible fix for missing datetime data types
PCerles Oct 5, 2020
029447d
update comment
PCerles Oct 5, 2020
30d0c90
added test
PCerles Oct 5, 2020
08d0ef1
updated test
PCerles Oct 5, 2020
3da79a4
added release note
PCerles Oct 5, 2020
b3a5261
restructured test to not rely on reset_index
PCerles Oct 6, 2020
d85af30
and make data smaller
PCerles Oct 6, 2020
70651d1
reformat from pd.NA
PCerles Oct 6, 2020
a70c0ff
test fixes
PCerles Oct 27, 2020
ce3a1fa
structure
PCerles Oct 27, 2020
83be75e
comma missing
PCerles Oct 27, 2020
fe1335e
fix import and explicitly construct multi indexes
PCerles Oct 27, 2020
e5045f3
changed 1.2 release notes and added right/left tests
PCerles Nov 2, 2020
9fb0687
accidentally removed newline
PCerles Nov 2, 2020
0f856dd
fix auto formatter
PCerles Nov 2, 2020
b1c7519
changed doc place and parametrized test
PCerles Nov 2, 2020
84822c6
restructured test per pr comments
PCerles Nov 3, 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
test fixes
  • Loading branch information
@PCerles
PCerles committed Nov 2, 2020
commit a70c0ff3671e69469ea7778e3885b48ac024d9ba
57 changes: 28 additions & 29 deletions pandas/tests/reshape/merge/test_multi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import numpy as np
import pytest

from numpy.random import randn
import pandas as pd
from pandas import DataFrame, Index, MultiIndex, Series
import pandas._testing as tm
from pandas.core.reshape.concat import concat
from pandas.core.reshape.merge import merge
import pytest


@pytest.fixture
Expand Down Expand Up @@ -457,33 +457,6 @@ def test_merge_na_keys(self):

tm.assert_frame_equal(result, expected)

def test_merge_datetime_index_empty_df(self):

date = np.array(
[pd.Timestamp("1950-01-01"), pd.Timestamp("1950-01-02")],
dtype=np.datetime64,
)
panel = np.array(["A", "B"], dtype=object)
data = np.array([1.5, 1.5], dtype=np.float64)

frame = DataFrame({"date": date, "panel": panel, "data": data}).set_index(
["date", "panel"]
)
other = DataFrame(columns=["date", "panel", "state"]).set_index(
["date", "panel"]
)

state = np.array([np.nan, np.nan], dtype=object)

expected = DataFrame(
{"date": date, "panel": panel, "data": data, "state": state}
)
expected = expected.set_index(["date", "panel"])

result = frame.merge(other, how="left", on=["date", "panel"])

tm.assert_frame_equal(result, expected)

@pytest.mark.parametrize("klass", [None, np.asarray, Series, Index])
def test_merge_datetime_index(self, klass):
# see gh-19038
Expand Down Expand Up @@ -863,3 +836,29 @@ def test_join_multi_wrong_order(self):
)

tm.assert_frame_equal(result, expected)


def test_merge_datetime_index_empty_df():

frame = DataFrame(
{
"date": [pd.Timestamp("1950-01-01"), pd.Timestamp("1950-01-02")],
"panel": ["A", "B"],
"data": [1.5, 1.5],
}
).set_index(["date", "panel"])
other = DataFrame(columns=["date", "panel", "state"]).set_index(["date", "panel"])

expected = DataFrame(
{
"date": [pd.Timestamp("1950-01-01"), pd.Timestamp("1950-01-02")],
"panel": ["A", "B"],
"data": [1.5, 1.5],
"state": [None, None],
}
)
expected = expected.set_index(["date", "panel"])

result = frame.merge(other, how="left", on=["date", "panel"])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can u test the other cases from the OP that they give the correct results


tm.assert_frame_equal(result, expected)
0