Generic solution to categorical problem · rs2/pandas@218da66 (original) (raw)

`@@ -1515,7 +1515,7 @@ def test_self_join_multiple_categories(self):

`

1515

1515

``

1516

1516

`assert_frame_equal(result, df)

`

1517

1517

``

1518

``

`-

def test_dtype_on_categorical_dates(self):

`

``

1518

`+

def test_categorical_dates(self):

`

1519

1519

`# GH 16900

`

1520

1520

`# dates should not be coerced to ints

`

1521

1521

``

`@@ -1534,10 +1534,13 @@ def test_dtype_on_categorical_dates(self):

`

1534

1534

`df2['date'] = df2['date'].astype('category')

`

1535

1535

``

1536

1536

`result = pd.merge(df, df2, how='outer', on=['date'])

`

1537

``

`-

assert result['date'].dtype == 'category'

`

``

1537

`+

assert result.shape == (3, 3)

`

``

1538

`+

assert result['date'].iloc[0] == pd.Timestamp('2001-01-01')

`

``

1539

`+

assert result['date'].iloc[-1] == pd.Timestamp('2001-01-03')

`

1538

1540

``

1539

1541

`result_inner = pd.merge(df, df2, how='inner', on=['date'])

`

1540

``

`-

assert result_inner['date'].dtype == 'category'

`

``

1542

`+

assert result_inner.shape == (1, 3)

`

``

1543

`+

assert result_inner['date'].iloc[-1] == pd.Timestamp('2001-01-01')

`

1541

1544

``

1542

1545

``

1543

1546

`@pytest.fixture

`