Skip to content

Commit 7cce2c7

Browse files
committed
Merge remote-tracking branch 'upstream/master' into sparsedepr
2 parents d78ecea + 6437f5e commit 7cce2c7

Some content is hidden

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

46 files changed

+1273
-583
lines changed

ci/deps/azure-36-locale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies:
2727
- openpyxl
2828
# lowest supported version of pyarrow (putting it here instead of in
2929
# azure-36-minimum_versions because it needs numpy >= 1.14)
30-
- pyarrow=0.12
30+
- pyarrow=0.13
3131
- pytables
3232
- python-dateutil
3333
- pytz

ci/deps/azure-macos-36.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222
- numexpr
2323
- numpy=1.14
2424
- openpyxl
25-
- pyarrow>=0.12.0
25+
- pyarrow>=0.13.0
2626
- pytables
2727
- python-dateutil==2.6.1
2828
- pytz

ci/deps/azure-windows-36.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222
- numpy=1.15.*
2323
- openpyxl
2424
- jinja2
25-
- pyarrow>=0.12.0
25+
- pyarrow>=0.13.0
2626
- pytables
2727
- python-dateutil
2828
- pytz

ci/deps/azure-windows-37.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ dependencies:
2424
- numexpr
2525
- numpy=1.14.*
2626
- openpyxl
27+
- pyarrow=0.14
2728
- pytables
2829
- python-dateutil
2930
- pytz

ci/deps/travis-36-cov.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ dependencies:
3131
# https://github.com/pandas-dev/pandas/pull/30009 openpyxl 3.0.2 broke
3232
- pandas-gbq
3333
- psycopg2
34-
- pyarrow>=0.12.0
34+
- pyarrow>=0.13.0
3535
- pymysql
3636
- pytables
3737
- python-snappy

doc/source/user_guide/io.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,6 +2066,8 @@ The Numpy parameter
20662066
+++++++++++++++++++
20672067

20682068
.. note::
2069+
This param has been deprecated as of version 1.0.0 and will raise a ``FutureWarning``.
2070+
20692071
This supports numeric data only. Index and columns labels may be non-numeric, e.g. strings, dates etc.
20702072

20712073
If ``numpy=True`` is passed to ``read_json`` an attempt will be made to sniff
@@ -2088,6 +2090,7 @@ data:
20882090
%timeit pd.read_json(jsonfloats)
20892091
20902092
.. ipython:: python
2093+
:okwarning:
20912094
20922095
%timeit pd.read_json(jsonfloats, numpy=True)
20932096
@@ -2102,6 +2105,7 @@ The speedup is less noticeable for smaller datasets:
21022105
%timeit pd.read_json(jsonfloats)
21032106
21042107
.. ipython:: python
2108+
:okwarning:
21052109
21062110
%timeit pd.read_json(jsonfloats, numpy=True)
21072111
@@ -4648,10 +4652,10 @@ Several caveats.
46484652
* Index level names, if specified, must be strings.
46494653
* In the ``pyarrow`` engine, categorical dtypes for non-string types can be serialized to parquet, but will de-serialize as their primitive dtype.
46504654
* The ``pyarrow`` engine preserves the ``ordered`` flag of categorical dtypes with string types. ``fastparquet`` does not preserve the ``ordered`` flag.
4651-
* Non supported types include ``Period`` and actual Python object types. These will raise a helpful error message
4652-
on an attempt at serialization.
4655+
* Non supported types include ``Interval`` and actual Python object types. These will raise a helpful error message
4656+
on an attempt at serialization. ``Period`` type is supported with pyarrow >= 0.16.0.
46534657
* The ``pyarrow`` engine preserves extension data types such as the nullable integer and string data
4654-
type (requiring pyarrow >= 1.0.0, and requiring the extension type to implement the needed protocols,
4658+
type (requiring pyarrow >= 0.16.0, and requiring the extension type to implement the needed protocols,
46554659
see the :ref:`extension types documentation <extending.extension.arrow>`).
46564660

46574661
You can specify an ``engine`` to direct the serialization. This can be one of ``pyarrow``, or ``fastparquet``, or ``auto``.

doc/source/whatsnew/v1.0.0.rst

Lines changed: 78 additions & 77 deletions
Large diffs are not rendered by default.

pandas/api/extensions/__init__.py

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
1-
"""Public API for extending pandas objects."""
2-
from pandas._libs.lib import no_default # noqa: F401
1+
"""
2+
Public API for extending pandas objects.
3+
"""
34

4-
from pandas.core.dtypes.dtypes import ( # noqa: F401
5-
ExtensionDtype,
6-
register_extension_dtype,
7-
)
5+
from pandas._libs.lib import no_default
6+
7+
from pandas.core.dtypes.dtypes import ExtensionDtype, register_extension_dtype
88

9-
from pandas.core.accessor import ( # noqa: F401
9+
from pandas.core.accessor import (
1010
register_dataframe_accessor,
1111
register_index_accessor,
1212
register_series_accessor,
1313
)
14-
from pandas.core.algorithms import take # noqa: F401
15-
from pandas.core.arrays import ExtensionArray, ExtensionScalarOpsMixin # noqa: F401
14+
from pandas.core.algorithms import take
15+
from pandas.core.arrays import ExtensionArray, ExtensionScalarOpsMixin
16+
17+
__all__ = [
18+
"no_default",
19+
"ExtensionDtype",
20+
"register_extension_dtype",
21+
"register_dataframe_accessor",
22+
"register_index_accessor",
23+
"register_series_accessor",
24+
"take",
25+
"ExtensionArray",
26+
"ExtensionScalarOpsMixin",
27+
]

pandas/api/indexers/__init__.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1-
"""Public API for Rolling Window Indexers"""
2-
from pandas.core.indexers import check_bool_array_indexer # noqa: F401
3-
from pandas.core.window.indexers import BaseIndexer # noqa: F401
1+
"""
2+
Public API for Rolling Window Indexers.
3+
"""
4+
5+
from pandas.core.indexers import check_bool_array_indexer
6+
from pandas.core.window.indexers import BaseIndexer
7+
8+
__all__ = ["check_bool_array_indexer", "BaseIndexer"]

pandas/api/types/__init__.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
1-
""" public toolkit API """
1+
"""
2+
Public toolkit API.
3+
"""
24

3-
from pandas._libs.lib import infer_dtype # noqa: F401
5+
from pandas._libs.lib import infer_dtype
46

57
from pandas.core.dtypes.api import * # noqa: F403, F401
6-
from pandas.core.dtypes.concat import union_categoricals # noqa: F401
7-
from pandas.core.dtypes.dtypes import ( # noqa: F401
8+
from pandas.core.dtypes.concat import union_categoricals
9+
from pandas.core.dtypes.dtypes import (
810
CategoricalDtype,
911
DatetimeTZDtype,
1012
IntervalDtype,
1113
PeriodDtype,
1214
)
15+
16+
__all__ = [
17+
"infer_dtype",
18+
"union_categoricals",
19+
"CategoricalDtype",
20+
"DatetimeTZDtype",
21+
"IntervalDtype",
22+
"PeriodDtype",
23+
]

0 commit comments

Comments
 (0)