Skip to content

Commit c086fcf

Browse files
committed
Add np.intc to _factorizers in merge
1 parent b635369 commit c086fcf

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

pandas/core/reshape/merge.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
np.int64: libhashtable.Int64Factorizer,
110110
np.longlong: libhashtable.Int64Factorizer,
111111
np.int32: libhashtable.Int32Factorizer,
112+
np.intc: libhashtable.Int32Factorizer,
112113
np.int16: libhashtable.Int16Factorizer,
113114
np.int8: libhashtable.Int8Factorizer,
114115
np.uint64: libhashtable.UInt64Factorizer,

pandas/tests/reshape/merge/test_merge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,7 @@ def test_different(self, right_vals):
14631463
result = merge(left, right, on="A")
14641464
assert is_object_dtype(result.A.dtype)
14651465

1466-
@pytest.mark.parametrize("d1", [np.int64, np.int32, np.int16, np.int8, np.uint8])
1466+
@pytest.mark.parametrize("d1", [np.int64, np.int32, np.intc, np.int16, np.int8, np.uint8])
14671467
@pytest.mark.parametrize("d2", [np.int64, np.float64, np.float32, np.float16])
14681468
def test_join_multi_dtypes(self, d1, d2):
14691469
dtype1 = np.dtype(d1)

0 commit comments

Comments
 (0)