Skip to content

Commit c392228

Browse files
MarcoGorelliMarcoGorelli
authored
Merge branch 'master' into 27453-right-merge-order
2 parents 819bd9e + cf01369 commit c392228

File tree

203 files changed

+5865
-5419
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

+5865
-5419
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/development/contributing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ check each issue individually, and it's not possible to find the unassigned ones
3232

3333
For this reason, we implemented a workaround consisting of adding a comment with the exact
3434
text `take`. When you do it, a GitHub action will automatically assign you the issue
35-
(this will take seconds, and may require refreshint the page to see it).
35+
(this will take seconds, and may require refreshing the page to see it).
3636
By doing this, it's possible to filter the list of issues and find only the unassigned ones.
3737

3838
So, a good way to find an issue to start contributing to pandas is to check the list of

‎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
------------

0 commit comments

Comments
 (0)