Code

BUG: merging an Integer EA rasises#23262

Code

Merged

jreback merged 15 commits intopandas-dev:masterpandas-dev/pandas:masterfrom

makbigc:bug-fix-23020makbigc/pandas:bug-fix-23020Copy head branch name to clipboard

Dec 19, 2018

Commits

Commits on Dec 16, 2018

• fix bug #GH23020

  makbigc

  committed
  1e0539d

  Copy full SHA for 1e0539d

• change after review

  makbigc

  committed
  9310361

  Copy full SHA for 9310361

• 2nd change after review

  makbigc

  committed
  cb2d4d1

  Copy full SHA for cb2d4d1

• 3rd change after review

  makbigc

  committed
  42477c3

  Copy full SHA for 42477c3

• Separate the test and add more cases

  makbigc

  committed
  6a9e360

  Copy full SHA for 6a9e360

• add more types into the test_merge_on_int_array

  makbigc

  committed
  373582e

  Copy full SHA for 373582e

• isort pandas/core/reshape/merge.py

  makbigc

  committed
  f817cad

  Copy full SHA for f817cad

• Add _values_for_factorize in period.py

  makbigc

  committed
  8140ee1

  Copy full SHA for 8140ee1

• Remove is_period_dtype check

  makbigc

  committed
  c425b24

  Copy full SHA for c425b24

• Modify _values_for_factorize in sparse.py

  makbigc

  committed
  29e820d

  Copy full SHA for 29e820d

• Test merge with EA as key and open a special case

  makbigc

  committed
  19621e6

  Copy full SHA for 19621e6

• Add factorize method in period.py

  makbigc

  committed
  a69f7b7

  Copy full SHA for a69f7b7

Commits on Dec 18, 2018

• Merge remote-tracking branch 'upstream/master' into makbigc-bug-fix-23020

  TomAugspurger

  committed
  529f88d

  Copy full SHA for 529f88d

• Updates

  Show description for 61f5e15
  TomAugspurger

  committed
  61f5e15

  Copy full SHA for 61f5e15

• Reorganize the if / elifs

  TomAugspurger

  committed
  6bae6ca

  Copy full SHA for 6bae6ca