Skip to content

Commit ef84fed

Browse files
committed
Merge to pass CI test
GH PR pandas-dev#42413 Merge branch 'master' into 41457-upgrade-to-bootstrap5
2 parents 28c17c7 + a69603d commit ef84fed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+179
-173
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
pull_request:
88
branches:
99
- master
10-
- 1.2.x
1110
- 1.3.x
1211

1312
env:

.github/workflows/database.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
pull_request:
88
branches:
99
- master
10-
- 1.2.x
1110
- 1.3.x
1211
paths-ignore:
1312
- "doc/**"

.github/workflows/posix.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
pull_request:
88
branches:
99
- master
10-
- 1.2.x
1110
- 1.3.x
1211
paths-ignore:
1312
- "doc/**"

.github/workflows/python-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- 1.3.x
78
pull_request:
89
branches:
910
- master

.github/workflows/sdist.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ on:
77
pull_request:
88
branches:
99
- master
10-
- 1.2.x
1110
- 1.3.x
1211
paths-ignore:
1312
- "doc/**"

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ repos:
6060
rev: v2.20.0
6161
hooks:
6262
- id: pyupgrade
63-
args: [--py37-plus]
63+
args: [--py38-plus]
6464
- repo: https://github.com/pre-commit/pygrep-hooks
6565
rev: v1.9.0
6666
hooks:

asv_bench/benchmarks/rolling.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,5 +296,8 @@ def time_apply(self, method):
296296
table_method_func, raw=True, engine="numba"
297297
)
298298

299+
def time_ewm_mean(self, method):
300+
self.df.ewm(1, method=method).mean(engine="numba")
301+
299302

300303
from .pandas_vb_common import setup # noqa: F401 isort:skip

azure-pipelines.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ trigger:
33
branches:
44
include:
55
- master
6-
- 1.2.x
76
- 1.3.x
87
paths:
98
exclude:

doc/source/getting_started/install.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ Visualization
262262
========================= ================== =============================================================
263263
Dependency Minimum Version Notes
264264
========================= ================== =============================================================
265-
setuptools 38.6.0 Utils for entry points of plotting backend
266265
matplotlib 3.3.2 Plotting library
267266
Jinja2 2.11 Conditional formatting with DataFrame.style
268267
tabulate 0.8.7 Printing in Markdown-friendly format (see `tabulate`_)

doc/source/whatsnew/v1.4.0.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ enhancement2
3030
Other enhancements
3131
^^^^^^^^^^^^^^^^^^
3232
- :meth:`Series.sample`, :meth:`DataFrame.sample`, and :meth:`.GroupBy.sample` now accept a ``np.random.Generator`` as input to ``random_state``. A generator will be more performant, especially with ``replace=False`` (:issue:`38100`)
33+
- :meth:`Series.ewm`, :meth:`DataFrame.ewm`, now support a ``method`` argument with a ``'table'`` option that performs the windowing operation over an entire :class:`DataFrame`. See :ref:`Window Overview <window.overview>` for performance and functional benefits (:issue:`42273`)
3334
-
3435

3536
.. ---------------------------------------------------------------------------
@@ -82,8 +83,6 @@ If installed, we now require:
8283
+-----------------+-----------------+----------+---------+
8384
| mypy (dev) | 0.910 | | X |
8485
+-----------------+-----------------+----------+---------+
85-
| setuptools | 38.6.0 | | |
86-
+-----------------+-----------------+----------+---------+
8786

8887
For `optional libraries <https://pandas.pydata.org/docs/getting_started/install.html>`_ the general recommendation is to use the latest version.
8988
The following table lists the lowest version per library that is currently being tested throughout the development of pandas.

0 commit comments

Comments
 (0)