Skip to content

Commit f2c0afd

Browse files
authored
Merge pull request #21 from s-t-e-v-e-n-k/support-numpy-2.4
Replace np.in1d with np.isin
2 parents 8b8c500 + 66c0863 commit f2c0afd

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

datamatrix/_datamatrix/_numericcolumn.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,9 @@ def _sortedrowid(self):
277277

278278
def _merge(self, other, _rowid):
279279

280-
i_other = ~np.in1d(other._rowid, self._rowid) \
281-
& np.in1d(other._rowid, _rowid)
282-
i_self = np.in1d(self._rowid, _rowid)
280+
i_other = ~np.isin(other._rowid, self._rowid) \
281+
& np.isin(other._rowid, _rowid)
282+
i_self = np.isin(self._rowid, _rowid)
283283
rowid = np.concatenate(
284284
(self._rowid[i_self], other._rowid[i_other]))
285285
seq = np.concatenate((self._seq[i_self], other._seq[i_other]))

0 commit comments

Comments
 (0)