Skip to content

Commit 1dc2deb

Browse files
jbrockmendeljbrockmendel
committed
Merge branch 'master' of https://github.com/pandas-dev/pandas into perf-arith-series-col
2 parents e50f7d5 + 61034b4 commit 1dc2deb

File tree

203 files changed

+5898
-5572
lines changed

Some content is hidden

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

203 files changed

+5898
-5572
lines changed

‎README.md

Lines changed: 10 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -5,82 +5,16 @@
55
-----------------
66

77
# pandas: powerful Python data analysis toolkit
8-
9-
<table>
10-
<tr>
11-
<td>Latest Release</td>
12-
<td>
13-
<a href="https://pypi.org/project/pandas/">
14-
<img src="https://img.shields.io/pypi/v/pandas.svg" alt="latest release" />
15-
</a>
16-
</td>
17-
</tr>
18-
<td></td>
19-
<td>
20-
<a href="https://anaconda.org/anaconda/pandas/">
21-
<img src="https://anaconda.org/conda-forge/pandas/badges/version.svg" alt="latest release" />
22-
</a>
23-
</td>
24-
</tr>
25-
<tr>
26-
<td>Package Status</td>
27-
<td>
28-
<a href="https://pypi.org/project/pandas/">
29-
<img src="https://img.shields.io/pypi/status/pandas.svg" alt="status" />
30-
</a>
31-
</td>
32-
</tr>
33-
<tr>
34-
<td>License</td>
35-
<td>
36-
<a href="https://github.com/pandas-dev/pandas/blob/master/LICENSE">
37-
<img src="https://img.shields.io/pypi/l/pandas.svg" alt="license" />
38-
</a>
39-
</td>
40-
</tr>
41-
<tr>
42-
<td>Build Status</td>
43-
<td>
44-
<a href="https://travis-ci.org/pandas-dev/pandas">
45-
<img src="https://travis-ci.org/pandas-dev/pandas.svg?branch=master" alt="travis build status" />
46-
</a>
47-
</td>
48-
</tr>
49-
<tr>
50-
<td></td>
51-
<td>
52-
<a href="https://dev.azure.com/pandas-dev/pandas/_build/latest?definitionId=1&branch=master">
53-
<img src="https://dev.azure.com/pandas-dev/pandas/_apis/build/status/pandas-dev.pandas?branch=master" alt="Azure Pipelines build status" />
54-
</a>
55-
</td>
56-
</tr>
57-
<tr>
58-
<td>Coverage</td>
59-
 <td>
60-
<a href="https://codecov.io/gh/pandas-dev/pandas">
61-
<img src="https://codecov.io/github/pandas-dev/pandas/coverage.svg?branch=master" alt="coverage" />
62-
</a>
63-
</td>
64-
</tr>
65-
<tr>
66-
<td>Downloads</td>
67-
<td>
68-
<a href="https://pandas.pydata.org">
69-
<img src="https://anaconda.org/conda-forge/pandas/badges/downloads.svg" alt="conda-forge downloads" />
70-
</a>
71-
</td>
72-
</tr>
73-
<tr>
74-
<td>Gitter</td>
75-
<td>
76-
<a href="https://gitter.im/pydata/pandas">
77-
<img src="https://badges.gitter.im/Join%20Chat.svg" />
78-
</a>
79-
</td>
80-
</tr>
81-
</table>
82-
83-
8+
[![PyPI Latest Release](https://img.shields.io/pypi/v/pandas.svg)](https://pypi.org/project/pandas/)
9+
[![Conda Latest Release](https://anaconda.org/conda-forge/pandas/badges/version.svg)](https://anaconda.org/anaconda/pandas/)
10+
[![Package Status](https://img.shields.io/pypi/status/pandas.svg)](https://pypi.org/project/pandas/)
11+
[![License](https://img.shields.io/pypi/l/pandas.svg)](https://github.com/pandas-dev/pandas/blob/master/LICENSE)
12+
[![Travis Build Status](https://travis-ci.org/pandas-dev/pandas.svg?branch=master)](https://travis-ci.org/pandas-dev/pandas)
13+
[![Azure Build Status](https://dev.azure.com/pandas-dev/pandas/_apis/build/status/pandas-dev.pandas?branch=master)](https://dev.azure.com/pandas-dev/pandas/_build/latest?definitionId=1&branch=master)
14+
[![Coverage](https://codecov.io/github/pandas-dev/pandas/coverage.svg?branch=master)](https://codecov.io/gh/pandas-dev/pandas)
15+
[![Downloads](https://anaconda.org/conda-forge/pandas/badges/downloads.svg)](https://pandas.pydata.org)
16+
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/pydata/pandas)
17+
[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org)
8418

8519
## What is it?
8620

‎ci/code_checks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ if [[ -z "$CHECK" || "$CHECK" == "lint" ]]; then
113113

114114
# Imports - Check formatting using isort see setup.cfg for settings
115115
MSG='Check import format using isort' ; echo $MSG
116-
ISORT_CMD="isort --recursive --check-only pandas asv_bench"
116+
ISORT_CMD="isort --quiet --recursive --check-only pandas asv_bench"
117117
if [[ "$GITHUB_ACTIONS" == "true" ]]; then
118118
eval $ISORT_CMD | awk '{print "##[error]" $0}'; RET=$(($RET + ${PIPESTATUS[0]}))
119119
else

‎ci/deps/travis-36-cov.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ dependencies:
2727
- numexpr
2828
- numpy=1.15.*
2929
- odfpy
30-
- openpyxl<=3.0.1
31-
# https://github.com/pandas-dev/pandas/pull/30009 openpyxl 3.0.2 broke
30+
- openpyxl
3231
- pandas-gbq
3332
- psycopg2
3433
- pyarrow>=0.13.0

‎ci/deps/travis-37.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ name: pandas-dev
22
channels:
33
- defaults
44
- conda-forge
5-
- c3i_test
65
dependencies:
76
- python=3.7.*
87

‎doc/redirects.csv

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ developer,development/developer
4646
extending,development/extending
4747
internals,development/internals
4848

49-
# api
49+
# api moved function
50+
reference/api/pandas.io.json.json_normalize,pandas.json_normalize
51+
52+
# api rename
5053
api,reference/index
5154
generated/pandas.api.extensions.ExtensionArray.argsort,../reference/api/pandas.api.extensions.ExtensionArray.argsort
5255
generated/pandas.api.extensions.ExtensionArray.astype,../reference/api/pandas.api.extensions.ExtensionArray.astype

‎doc/source/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
"external_links": [],
210210
"github_url": "https://github.com/pandas-dev/pandas",
211211
"twitter_url": "https://twitter.com/pandas_dev",
212+
"google_analytics_id": "UA-27880019-2",
212213
}
213214

214215
# Add any paths that contain custom themes here, relative to this directory.

‎doc/source/getting_started/basics.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,7 @@ Pandas has two ways to store strings.
19731973
1. ``object`` dtype, which can hold any Python object, including strings.
19741974
2. :class:`StringDtype`, which is dedicated to strings.
19751975

1976-
Generally, we recommend using :class:`StringDtype`. See :ref:`text.types` fore more.
1976+
Generally, we recommend using :class:`StringDtype`. See :ref:`text.types` for more.
19771977

19781978
Finally, arbitrary objects may be stored using the ``object`` dtype, but should
19791979
be avoided to the extent possible (for performance and interoperability with

‎doc/source/user_guide/visualization.rst

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,3 +1641,46 @@ when plotting a large number of points.
16411641
:suppress:
16421642
16431643
plt.close('all')
1644+
1645+
Plotting backends
1646+
-----------------
1647+
1648+
Starting in version 0.25, pandas can be extended with third-party plotting backends. The
1649+
main idea is letting users select a plotting backend different than the provided
1650+
one based on Matplotlib.
1651+
1652+
This can be done by passsing 'backend.module' as the argument ``backend`` in ``plot``
1653+
function. For example:
1654+
1655+
.. code-block:: python
1656+
1657+
>>> Series([1, 2, 3]).plot(backend='backend.module')
1658+
1659+
Alternatively, you can also set this option globally, do you don't need to specify
1660+
the keyword in each ``plot`` call. For example:
1661+
1662+
.. code-block:: python
1663+
1664+
>>> pd.set_option('plotting.backend', 'backend.module')
1665+
>>> pd.Series([1, 2, 3]).plot()
1666+
1667+
Or:
1668+
1669+
.. code-block:: python
1670+
1671+
>>> pd.options.plotting.backend = 'backend.module'
1672+
>>> pd.Series([1, 2, 3]).plot()
1673+
1674+
This would be more or less equivalent to:
1675+
1676+
.. code-block:: python
1677+
1678+
>>> import backend.module
1679+
>>> backend.module.plot(pd.Series([1, 2, 3]))
1680+
1681+
The backend module can then use other visualization tools (Bokeh, Altair, hvplot,...)
1682+
to generate the plots. Some libraries implementing a backend for pandas are listed
1683+
on the ecosystem :ref:`ecosystem.visualization` page.
1684+
1685+
Developers guide can be found at
1686+
https://dev.pandas.io/docs/development/extending.html#plotting-backends

‎doc/source/whatsnew/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Version 1.0
2626

2727
v1.0.0
2828
v1.0.1
29+
v1.0.2
2930

3031
Version 0.25
3132
------------

‎doc/source/whatsnew/v1.0.0.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,6 @@ Numeric
11071107
- Bug in :meth:`DataFrame.round` where a :class:`DataFrame` with a :class:`CategoricalIndex` of :class:`IntervalIndex` columns would incorrectly raise a ``TypeError`` (:issue:`30063`)
11081108
- Bug in :meth:`Series.pct_change` and :meth:`DataFrame.pct_change` when there are duplicated indices (:issue:`30463`)
11091109
- Bug in :class:`DataFrame` cumulative operations (e.g. cumsum, cummax) incorrect casting to object-dtype (:issue:`19296`)
1110-
- Bug in dtypes being lost in ``DataFrame.__invert__`` (``~`` operator) with mixed dtypes (:issue:`31183`)
11111110
- Bug in :class:`~DataFrame.diff` losing the dtype for extension types (:issue:`30889`)
11121111
- Bug in :class:`DataFrame.diff` raising an ``IndexError`` when one of the columns was a nullable integer dtype (:issue:`30967`)
11131112

@@ -1260,8 +1259,6 @@ ExtensionArray
12601259
- Bug in :class:`arrays.PandasArray` when setting a scalar string (:issue:`28118`, :issue:`28150`).
12611260
- Bug where nullable integers could not be compared to strings (:issue:`28930`)
12621261
- Bug where :class:`DataFrame` constructor raised ``ValueError`` with list-like data and ``dtype`` specified (:issue:`30280`)
1263-
- Bug in dtype being lost in ``__invert__`` (``~`` operator) for extension-array backed ``Series`` and ``DataFrame`` (:issue:`23087`)
1264-
12651262

12661263
Other
12671264
^^^^^

0 commit comments

Comments
 (0)