Skip to content

Commit 749f68a

Browse files
committed
Merge branch 'master' of https://github.com/pandas-dev/pandas into bug-clear-cache
2 parents f10d4c3 + 0bc407a commit 749f68a

File tree

109 files changed

+3640
-931
lines changed

Some content is hidden

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

109 files changed

+3640
-931
lines changed

.pre-commit-config.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,3 @@ repos:
3030
- id: isort
3131
language: python_venv
3232
exclude: ^pandas/__init__\.py$|^pandas/core/api\.py$
33-
- repo: https://github.com/pre-commit/mirrors-mypy
34-
rev: v0.730
35-
hooks:
36-
- id: mypy
37-
args:
38-
# As long as a some files are excluded from check-untyped-defs
39-
# we have to exclude it from the pre-commit hook as the configuration
40-
# is based on modules but the hook runs on files.
41-
- --no-check-untyped-defs
42-
- --follow-imports
43-
- skip
44-
files: pandas/

ci/deps/azure-37-locale_slow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
- lxml
1919
- matplotlib=3.0.0
2020
- numpy=1.16.*
21-
- openpyxl=2.5.7
21+
- openpyxl=2.6.0
2222
- python-dateutil
2323
- python-blosc
2424
- pytz=2017.3

ci/deps/azure-37-minimum_versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies:
1919
- numba=0.46.0
2020
- numexpr=2.6.8
2121
- numpy=1.16.5
22-
- openpyxl=2.5.7
22+
- openpyxl=2.6.0
2323
- pytables=3.4.4
2424
- python-dateutil=2.7.3
2525
- pytz=2017.3

doc/source/development/contributing.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ You will need `Build Tools for Visual Studio 2017
204204
You DO NOT need to install Visual Studio 2019.
205205
You only need "Build Tools for Visual Studio 2019" found by
206206
scrolling down to "All downloads" -> "Tools for Visual Studio 2019".
207+
In the installer, select the "C++ build tools" workload.
207208

208209
**Mac OS**
209210

doc/source/getting_started/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ html5lib 1.0.1 HTML parser for read_html (see :ref
274274
lxml 4.3.0 HTML parser for read_html (see :ref:`note <optional_html>`)
275275
matplotlib 2.2.3 Visualization
276276
numba 0.46.0 Alternative execution engine for rolling operations
277-
openpyxl 2.5.7 Reading / writing for xlsx files
277+
openpyxl 2.6.0 Reading / writing for xlsx files
278278
pandas-gbq 0.12.0 Google Big Query access
279279
psycopg2 2.7 PostgreSQL engine for sqlalchemy
280280
pyarrow 0.15.0 Parquet, ORC, and feather reading / writing

doc/source/getting_started/overview.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Package overview
99
**pandas** is a `Python <https://www.python.org>`__ package providing fast,
1010
flexible, and expressive data structures designed to make working with
1111
"relational" or "labeled" data both easy and intuitive. It aims to be the
12-
fundamental high-level building block for doing practical, **real world** data
12+
fundamental high-level building block for doing practical, **real-world** data
1313
analysis in Python. Additionally, it has the broader goal of becoming **the
14-
most powerful and flexible open source data analysis / manipulation tool
14+
most powerful and flexible open source data analysis/manipulation tool
1515
available in any language**. It is already well on its way toward this goal.
1616

1717
pandas is well suited for many different kinds of data:
@@ -21,7 +21,7 @@ pandas is well suited for many different kinds of data:
2121
- Ordered and unordered (not necessarily fixed-frequency) time series data.
2222
- Arbitrary matrix data (homogeneously typed or heterogeneous) with row and
2323
column labels
24-
- Any other form of observational / statistical data sets. The data actually
24+
- Any other form of observational / statistical data sets. The data
2525
need not be labeled at all to be placed into a pandas data structure
2626

2727
The two primary data structures of pandas, :class:`Series` (1-dimensional)
@@ -57,7 +57,7 @@ Here are just a few of the things that pandas does well:
5757
Excel files, databases, and saving / loading data from the ultrafast **HDF5
5858
format**
5959
- **Time series**-specific functionality: date range generation and frequency
60-
conversion, moving window statistics, date shifting and lagging.
60+
conversion, moving window statistics, date shifting, and lagging.
6161

6262
Many of these principles are here to address the shortcomings frequently
6363
experienced using other languages / scientific research environments. For data
@@ -101,12 +101,12 @@ fashion.
101101

102102
Also, we would like sensible default behaviors for the common API functions
103103
which take into account the typical orientation of time series and
104-
cross-sectional data sets. When using ndarrays to store 2- and 3-dimensional
104+
cross-sectional data sets. When using the N-dimensional array (ndarrays) to store 2- and 3-dimensional
105105
data, a burden is placed on the user to consider the orientation of the data
106106
set when writing functions; axes are considered more or less equivalent (except
107107
when C- or Fortran-contiguousness matters for performance). In pandas, the axes
108108
are intended to lend more semantic meaning to the data; i.e., for a particular
109-
data set there is likely to be a "right" way to orient the data. The goal,
109+
data set, there is likely to be a "right" way to orient the data. The goal,
110110
then, is to reduce the amount of mental effort required to code up data
111111
transformations in downstream functions.
112112

@@ -148,8 +148,8 @@ pandas possible. Thanks to `all of our contributors <https://github.com/pandas-d
148148
If you're interested in contributing, please visit the :ref:`contributing guide <contributing>`.
149149

150150
pandas is a `NumFOCUS <https://www.numfocus.org/open-source-projects/>`__ sponsored project.
151-
This will help ensure the success of development of pandas as a world-class open-source
152-
project, and makes it possible to `donate <https://pandas.pydata.org/donate.html>`__ to the project.
151+
This will help ensure the success of the development of pandas as a world-class open-source
152+
project and makes it possible to `donate <https://pandas.pydata.org/donate.html>`__ to the project.
153153

154154
Project governance
155155
------------------

doc/source/user_guide/computation.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,9 @@ compute the mean absolute deviation on a rolling basis:
361361
@savefig rolling_apply_ex.png
362362
s.rolling(window=60).apply(mad, raw=True).plot(style='k')
363363
364+
Using the Numba engine
365+
~~~~~~~~~~~~~~~~~~~~~~
366+
364367
.. versionadded:: 1.0
365368

366369
Additionally, :meth:`~Rolling.apply` can leverage `Numba <https://numba.pydata.org/>`__

doc/source/user_guide/enhancingperf.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,13 @@ nicer interface by passing/returning pandas objects.
373373
374374
In this example, using Numba was faster than Cython.
375375

376+
Numba as an argument
377+
~~~~~~~~~~~~~~~~~~~~
378+
379+
Additionally, we can leverage the power of `Numba <https://numba.pydata.org/>`__
380+
by calling it as an argument in :meth:`~Rolling.apply`. See :ref:`Computation tools
381+
<stats.rolling_apply>` for an extensive example.
382+
376383
Vectorize
377384
~~~~~~~~~
378385

doc/source/user_guide/sparse.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,15 @@ The :attr:`SparseArray.dtype` property stores two pieces of information
8787
sparr.dtype
8888
8989
90-
A :class:`SparseDtype` may be constructed by passing each of these
90+
A :class:`SparseDtype` may be constructed by passing only a dtype
9191

9292
.. ipython:: python
9393
9494
pd.SparseDtype(np.dtype('datetime64[ns]'))
9595
96-
The default fill value for a given NumPy dtype is the "missing" value for that dtype,
97-
though it may be overridden.
96+
in which case a default fill value will be used (for NumPy dtypes this is often the
97+
"missing" value for that dtype). To override this default an explicit fill value may be
98+
passed instead
9899

99100
.. ipython:: python
100101

doc/source/whatsnew/v1.1.2.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ including other versions of pandas.
1515
Fixed regressions
1616
~~~~~~~~~~~~~~~~~
1717
- Regression in :meth:`DatetimeIndex.intersection` incorrectly raising ``AssertionError`` when intersecting against a list (:issue:`35876`)
18+
- Fix regression in updating a column inplace (e.g. using ``df['col'].fillna(.., inplace=True)``) (:issue:`35731`)
1819
- Performance regression for :meth:`RangeIndex.format` (:issue:`35712`)
20+
- Regression in :meth:`DataFrame.replace` where a ``TypeError`` would be raised when attempting to replace elements of type :class:`Interval` (:issue:`35931`)
1921
-
2022

2123

@@ -29,7 +31,7 @@ Bug fixes
2931
- Bug in :class:`Series` constructor raising a ``TypeError`` when constructing sparse datetime64 dtypes (:issue:`35762`)
3032
- Bug in :meth:`DataFrame.apply` with ``result_type="reduce"`` returning with incorrect index (:issue:`35683`)
3133
- Bug in :meth:`DateTimeIndex.format` and :meth:`PeriodIndex.format` with ``name=True`` setting the first item to ``"None"`` where it should bw ``""`` (:issue:`35712`)
32-
-
34+
- Bug in :meth:`Float64Index.__contains__` incorrectly raising ``TypeError`` instead of returning ``False`` (:issue:`35788`)
3335

3436
.. ---------------------------------------------------------------------------
3537

0 commit comments

Comments
 (0)