Skip to content

Commit cdea7fe

Browse files
committed
move whatsnew to 0.22.0
1 parent f2aa9c7 commit cdea7fe

File tree

3 files changed

+3
-19
lines changed

3 files changed

+3
-19
lines changed

doc/source/whatsnew/v0.21.0.txt

+1-15
Original file line numberDiff line numberDiff line change
@@ -1047,23 +1047,8 @@ Indexing
10471047
- Bug in intersection of ``RangeIndex`` with negative step (:issue:`17296`)
10481048
- Bug in ``IntervalIndex`` where performing a scalar lookup fails for included right endpoints of non-overlapping monotonic decreasing indexes (:issue:`16417`, :issue:`17271`)
10491049
- Bug in :meth:`DataFrame.first_valid_index` and :meth:`DataFrame.last_valid_index` when no valid entry (:issue:`17400`)
1050-
<<<<<<< HEAD
1051-
<<<<<<< HEAD
10521050
- Bug in :func:`Series.rename` when called with a callable, incorrectly alters the name of the ``Series``, rather than the name of the ``Index``. (:issue:`17407`)
10531051
- Bug in :func:`String.str_get` raises ``IndexError`` instead of inserting NaNs when using a negative index. (:issue:`17704`)
1054-
=======
1055-
- Bug in :func:`Series.rename` when called with a `callable`, incorrectly alters the name of the `Series`, rather than the name of the `Index`. (:issue:`17407`)
1056-
- Bug in :func:`String.str_get` raises `index out of range` error instead of inserting NaNs when using a negative index. (:issue:`17704`)
1057-
<<<<<<< HEAD
1058-
- When created with duplicate labels, ``MultiIndex`` now raises a `ValueError`. (:issue:`17464`)
1059-
>>>>>>> 4eff2d5... whatsnew entry
1060-
=======
1061-
=======
1062-
- Bug in :func:`Series.rename` when called with a callable, incorrectly alters the name of the ``Series``, rather than the name of the ``Index``. (:issue:`17407`)
1063-
- Bug in :func:`String.str_get` raises ``IndexError`` instead of inserting NaNs when using a negative index. (:issue:`17704`)
1064-
>>>>>>> f74a4ab... whatsnew merging
1065-
- When created with duplicate labels, ``MultiIndex`` now raises a ``ValueError``. (:issue:`17464`)
1066-
>>>>>>> 868ec45... Whatsnew backticks
10671052

10681053
I/O
10691054
^^^
@@ -1167,3 +1152,4 @@ Other
11671152
^^^^^
11681153
- Bug where some inplace operators were not being wrapped and produced a copy when invoked (:issue:`12962`)
11691154
- Bug in :func:`eval` where the ``inplace`` parameter was being incorrectly handled (:issue:`16732`)
1155+

doc/source/whatsnew/v0.22.0.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ Other API Changes
4343
- ``NaT`` division with :class:`datetime.timedelta` will now return ``NaN`` instead of raising (:issue:`17876`)
4444
- :class:`Timestamp` will no longer silently ignore unused or invalid `tz` or `tzinfo` arguments (:issue:`17690`)
4545
- :class:`CacheableOffset` and :class:`WeekDay` are no longer available in the `tseries.offsets` module (:issue:`17830`)
46-
-
46+
47+
- When created with duplicate labels, ``MultiIndex`` now raises a ``ValueError``. (:issue:`17464`)
4748

4849
.. _whatsnew_0220.deprecations:
4950

pandas/tests/indexes/test_multi.py

-3
Original file line numberDiff line numberDiff line change
@@ -2377,11 +2377,8 @@ def test_level_setting_resets_attributes(self):
23772377
['A', 'A', 'B', 'B', 'B'], [1, 2, 1, 2, 3]
23782378
])
23792379
assert ind.is_monotonic
2380-
<<<<<<< HEAD
23812380

23822381
# GH 17464 - Remove duplicate MultiIndex levels
2383-
=======
2384-
>>>>>>> 6ce2637... Removed comments about this issue from other tests
23852382
ind.set_levels([['A', 'B'], [1, 3, 2]], inplace=True)
23862383
# if this fails, probably didn't reset the cache correctly.
23872384
assert not ind.is_monotonic

0 commit comments

Comments
 (0)