Skip to content

Commit e500a22

Browse files
committed
Fix Panel.update
1 parent f120d65 commit e500a22

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

doc/source/whatsnew/v0.24.0.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@ Deprecations
10261026
- The ``fastpath`` keyword of the different Index constructors is deprecated (:issue:`23110`).
10271027
- :meth:`Timestamp.tz_localize`, :meth:`DatetimeIndex.tz_localize`, and :meth:`Series.tz_localize` have deprecated the ``errors`` argument in favor of the ``nonexistent`` argument (:issue:`8917`)
10281028
- The class ``FrozenNDArray`` has been deprecated. When unpickling, ``FrozenNDArray`` will be unpickled to ``np.ndarray`` once this class is removed (:issue:`9031`)
1029-
- The method :meth:`DataFrame.update` has deprecated the ``raise_conflict=False|True`` keyword in favor of ``errors='ignore'|'raise'`` (:issue:`23585`)
1029+
- The methods :meth:`DataFrame.update` and :meth:`Panel.update` have deprecated the ``raise_conflict=False|True`` keyword in favor of ``errors='ignore'|'raise'`` (:issue:`23585`)
10301030
- Deprecated the `nthreads` keyword of :func:`pandas.read_feather` in favor of
10311031
`use_threads` to reflect the changes in pyarrow 0.11.0. (:issue:`23053`)
10321032
- :func:`pandas.read_excel` has deprecated accepting ``usecols`` as an integer. Please pass in a list of ints from 0 to ``usecols`` inclusive instead (:issue:`23527`)

pandas/tests/test_panel.py

+1
Original file line numberDiff line numberDiff line change
@@ -2358,6 +2358,7 @@ def test_update_raise_on_overlap(self):
23582358
[[1.5, np.nan, 3.], [1.5, np.nan, 3.],
23592359
[1.5, np.nan, 3.],
23602360
[1.5, np.nan, 3.]]])
2361+
other = Panel([[[]]])
23612362

23622363
with pytest.raises(ValueError, match='Data overlaps'):
23632364
pan.update(pan, errors='raise')

0 commit comments

Comments
 (0)