Skip to content

Commit 74cb8b5

Browse files
committed
Merge remote-tracking branch 'upstream/main' into cow_indexing_midx_slice
# Conflicts: # doc/source/whatsnew/v2.0.0.rst
2 parents ed83c88 + 506fe53 commit 74cb8b5

38 files changed

+366
-182
lines changed

.github/workflows/32-bit-linux.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ on:
55
branches:
66
- main
77
- 2.0.x
8-
- 1.5.x
98
pull_request:
109
branches:
1110
- main
1211
- 2.0.x
13-
- 1.5.x
1412
paths-ignore:
1513
- "doc/**"
1614

.github/workflows/code-checks.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ on:
55
branches:
66
- main
77
- 2.0.x
8-
- 1.5.x
98
pull_request:
109
branches:
1110
- main
1211
- 2.0.x
13-
- 1.5.x
1412

1513
env:
1614
ENV_FILE: environment.yml

.github/workflows/docbuild-and-upload.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ on:
55
branches:
66
- main
77
- 2.0.x
8-
- 1.5.x
98
tags:
109
- '*'
1110
pull_request:
1211
branches:
1312
- main
1413
- 2.0.x
15-
- 1.5.x
1614

1715
env:
1816
ENV_FILE: environment.yml

.github/workflows/macos-windows.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ on:
55
branches:
66
- main
77
- 2.0.x
8-
- 1.5.x
98
pull_request:
109
branches:
1110
- main
1211
- 2.0.x
13-
- 1.5.x
1412
paths-ignore:
1513
- "doc/**"
1614
- "web/**"

.github/workflows/package-checks.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ on:
55
branches:
66
- main
77
- 2.0.x
8-
- 1.5.x
98
pull_request:
109
branches:
1110
- main
1211
- 2.0.x
13-
- 1.5.x
1412
types: [ labeled, opened, synchronize, reopened ]
1513

1614
permissions:

.github/workflows/python-dev.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ name: Python Dev
2323
on:
2424
push:
2525
branches:
26-
# - main
27-
# - 1.5.x
26+
- main
27+
- 2.0.x
2828
- None
2929
pull_request:
3030
branches:
31-
# - main
32-
# - 1.5.x
31+
- main
32+
- 2.0.x
3333
- None
3434
paths-ignore:
3535
- "doc/**"
@@ -47,7 +47,7 @@ permissions:
4747

4848
jobs:
4949
build:
50-
# if: false # Uncomment this to freeze the workflow, comment it to unfreeze
50+
if: false # Uncomment this to freeze the workflow, comment it to unfreeze
5151
runs-on: ${{ matrix.os }}
5252
strategy:
5353
fail-fast: false

.github/workflows/sdist.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ on:
55
branches:
66
- main
77
- 2.0.x
8-
- 1.5.x
98
pull_request:
109
branches:
1110
- main
1211
- 2.0.x
13-
- 1.5.x
1412
types: [labeled, opened, synchronize, reopened]
1513
paths-ignore:
1614
- "doc/**"

.github/workflows/ubuntu.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ on:
55
branches:
66
- main
77
- 2.0.x
8-
- 1.5.x
98
pull_request:
109
branches:
1110
- main
1211
- 2.0.x
13-
- 1.5.x
1412
paths-ignore:
1513
- "doc/**"
1614
- "web/**"

doc/source/whatsnew/v2.0.0.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ Copy-on-Write improvements
209209
- :meth:`DataFrame.__getitem__` will now respect the Copy-on-Write mechanism when the
210210
:class:`DataFrame` has :class:`MultiIndex` columns.
211211

212+
- :meth:`Series.view` will now respect the Copy-on-Write mechanism.
213+
212214
Copy-on-Write can be enabled through one of
213215

214216
.. code-block:: python

doc/source/whatsnew/v2.1.0.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Performance improvements
117117
- Performance improvement when parsing strings to ``boolean[pyarrow]`` dtype (:issue:`51730`)
118118
- Performance improvement when searching an :class:`Index` sliced from other indexes (:issue:`51738`)
119119
- Performance improvement in :meth:`Series.combine_first` (:issue:`51777`)
120+
- Performance improvement in :meth:`MultiIndex.set_levels` and :meth:`MultiIndex.set_codes` when ``verify_integrity=True`` (:issue:`51873`)
120121
- Performance improvement in :func:`factorize` for object columns not containing strings (:issue:`51921`)
121122

122123
.. ---------------------------------------------------------------------------
@@ -183,7 +184,7 @@ MultiIndex
183184

184185
I/O
185186
^^^
186-
-
187+
- :meth:`DataFrame.to_orc` now raising ``ValueError`` when non-default :class:`Index` is given (:issue:`51828`)
187188
-
188189

189190
Period
@@ -201,6 +202,7 @@ Groupby/resample/rolling
201202
^^^^^^^^^^^^^^^^^^^^^^^^
202203
- Bug in :meth:`DataFrameGroupBy.idxmin`, :meth:`SeriesGroupBy.idxmin`, :meth:`DataFrameGroupBy.idxmax`, :meth:`SeriesGroupBy.idxmax` return wrong dtype when used on empty DataFrameGroupBy or SeriesGroupBy (:issue:`51423`)
203204
- Bug in weighted rolling aggregations when specifying ``min_periods=0`` (:issue:`51449`)
205+
- Bug in :meth:`DataFrame.resample` and :meth:`Series.resample` in incorrectly allowing non-fixed ``freq`` when resampling on a :class:`TimedeltaIndex` (:issue:`51896`)
204206
-
205207

206208
Reshaping
@@ -227,6 +229,7 @@ Styler
227229

228230
Other
229231
^^^^^
232+
-
230233

231234
.. ***DO NOT USE THIS SECTION***
232235

0 commit comments

Comments
 (0)