Skip to content

Commit 90126cc

Browse files
committed
Merge remote-tracking branch 'upstream/master' into fix-doc-line-length
2 parents b9ae2ac + 4a31802 commit 90126cc

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

doc/source/whatsnew/v1.1.3.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. _whatsnew_113:
22

3-
What's new in 1.1.3 (??)
4-
------------------------
3+
What's new in 1.1.3 (October 5, 2020)
4+
-------------------------------------
55

66
These are the changes in pandas 1.1.3. See :ref:`release` for a full changelog
77
including other versions of pandas.

doc/source/whatsnew/v1.2.0.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ Performance improvements
284284
- ``Styler`` uuid method altered to compress data transmission over web whilst maintaining reasonably low table collision probability (:issue:`36345`)
285285
- Performance improvement in :meth:`pd.to_datetime` with non-ns time unit for ``float`` ``dtype`` columns (:issue:`20445`)
286286
- Performance improvement in setting values on a :class:`IntervalArray` (:issue:`36310`)
287+
- Performance improvement in :meth:`RollingGroupby.count` (:issue:`35625`)
287288

288289
.. ---------------------------------------------------------------------------
289290

pandas/compat/pickle_compat.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ def patch_pickle():
274274
"""
275275
orig_loads = pkl.loads
276276
try:
277-
pkl.loads = loads
277+
setattr(pkl, "loads", loads)
278278
yield
279279
finally:
280-
pkl.loads = orig_loads
280+
setattr(pkl, "loads", orig_loads)

pandas/core/window/common.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ def __init__(self, obj, *args, **kwargs):
5858
self._groupby.grouper.mutated = True
5959
super().__init__(obj, *args, **kwargs)
6060

61-
count = _dispatch("count")
6261
corr = _dispatch("corr", other=None, pairwise=None)
6362
cov = _dispatch("cov", other=None, pairwise=None)
6463

setup.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ check_untyped_defs=False
136136
[mypy-pandas._version]
137137
check_untyped_defs=False
138138

139-
[mypy-pandas.compat.pickle_compat]
140-
check_untyped_defs=False
141-
142139
[mypy-pandas.core.apply]
143140
check_untyped_defs=False
144141

0 commit comments

Comments
 (0)