Skip to content

Commit 61c4f5d

Browse files
committed
Merge branch 'master' into PR_TOOL_MERGE_PR_19236
2 parents b6dab1e + 04a6815 commit 61c4f5d

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

+1290
-468
lines changed

LICENSES/XARRAY_LICENSE

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction, and
10+
distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by the copyright
13+
owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all other entities
16+
that control, are controlled by, or are under common control with that entity.
17+
For the purposes of this definition, "control" means (i) the power, direct or
18+
indirect, to cause the direction or management of such entity, whether by
19+
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
20+
outstanding shares, or (iii) beneficial ownership of such entity.
21+
22+
"You" (or "Your") shall mean an individual or Legal Entity exercising
23+
permissions granted by this License.
24+
25+
"Source" form shall mean the preferred form for making modifications, including
26+
but not limited to software source code, documentation source, and configuration
27+
files.
28+
29+
"Object" form shall mean any form resulting from mechanical transformation or
30+
translation of a Source form, including but not limited to compiled object code,
31+
generated documentation, and conversions to other media types.
32+
33+
"Work" shall mean the work of authorship, whether in Source or Object form, made
34+
available under the License, as indicated by a copyright notice that is included
35+
in or attached to the work (an example is provided in the Appendix below).
36+
37+
"Derivative Works" shall mean any work, whether in Source or Object form, that
38+
is based on (or derived from) the Work and for which the editorial revisions,
39+
annotations, elaborations, or other modifications represent, as a whole, an
40+
original work of authorship. For the purposes of this License, Derivative Works
41+
shall not include works that remain separable from, or merely link (or bind by
42+
name) to the interfaces of, the Work and Derivative Works thereof.
43+
44+
"Contribution" shall mean any work of authorship, including the original version
45+
of the Work and any modifications or additions to that Work or Derivative Works
46+
thereof, that is intentionally submitted to Licensor for inclusion in the Work
47+
by the copyright owner or by an individual or Legal Entity authorized to submit
48+
on behalf of the copyright owner. For the purposes of this definition,
49+
"submitted" means any form of electronic, verbal, or written communication sent
50+
to the Licensor or its representatives, including but not limited to
51+
communication on electronic mailing lists, source code control systems, and
52+
issue tracking systems that are managed by, or on behalf of, the Licensor for
53+
the purpose of discussing and improving the Work, but excluding communication
54+
that is conspicuously marked or otherwise designated in writing by the copyright
55+
owner as "Not a Contribution."
56+
57+
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
58+
of whom a Contribution has been received by Licensor and subsequently
59+
incorporated within the Work.
60+
61+
2. Grant of Copyright License.
62+
63+
Subject to the terms and conditions of this License, each Contributor hereby
64+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
65+
irrevocable copyright license to reproduce, prepare Derivative Works of,
66+
publicly display, publicly perform, sublicense, and distribute the Work and such
67+
Derivative Works in Source or Object form.
68+
69+
3. Grant of Patent License.
70+
71+
Subject to the terms and conditions of this License, each Contributor hereby
72+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
73+
irrevocable (except as stated in this section) patent license to make, have
74+
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
75+
such license applies only to those patent claims licensable by such Contributor
76+
that are necessarily infringed by their Contribution(s) alone or by combination
77+
of their Contribution(s) with the Work to which such Contribution(s) was
78+
submitted. If You institute patent litigation against any entity (including a
79+
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
80+
Contribution incorporated within the Work constitutes direct or contributory
81+
patent infringement, then any patent licenses granted to You under this License
82+
for that Work shall terminate as of the date such litigation is filed.
83+
84+
4. Redistribution.
85+
86+
You may reproduce and distribute copies of the Work or Derivative Works thereof
87+
in any medium, with or without modifications, and in Source or Object form,
88+
provided that You meet the following conditions:
89+
90+
You must give any other recipients of the Work or Derivative Works a copy of
91+
this License; and
92+
You must cause any modified files to carry prominent notices stating that You
93+
changed the files; and
94+
You must retain, in the Source form of any Derivative Works that You distribute,
95+
all copyright, patent, trademark, and attribution notices from the Source form
96+
of the Work, excluding those notices that do not pertain to any part of the
97+
Derivative Works; and
98+
If the Work includes a "NOTICE" text file as part of its distribution, then any
99+
Derivative Works that You distribute must include a readable copy of the
100+
attribution notices contained within such NOTICE file, excluding those notices
101+
that do not pertain to any part of the Derivative Works, in at least one of the
102+
following places: within a NOTICE text file distributed as part of the
103+
Derivative Works; within the Source form or documentation, if provided along
104+
with the Derivative Works; or, within a display generated by the Derivative
105+
Works, if and wherever such third-party notices normally appear. The contents of
106+
the NOTICE file are for informational purposes only and do not modify the
107+
License. You may add Your own attribution notices within Derivative Works that
108+
You distribute, alongside or as an addendum to the NOTICE text from the Work,
109+
provided that such additional attribution notices cannot be construed as
110+
modifying the License.
111+
You may add Your own copyright statement to Your modifications and may provide
112+
additional or different license terms and conditions for use, reproduction, or
113+
distribution of Your modifications, or for any such Derivative Works as a whole,
114+
provided Your use, reproduction, and distribution of the Work otherwise complies
115+
with the conditions stated in this License.
116+
117+
5. Submission of Contributions.
118+
119+
Unless You explicitly state otherwise, any Contribution intentionally submitted
120+
for inclusion in the Work by You to the Licensor shall be under the terms and
121+
conditions of this License, without any additional terms or conditions.
122+
Notwithstanding the above, nothing herein shall supersede or modify the terms of
123+
any separate license agreement you may have executed with Licensor regarding
124+
such Contributions.
125+
126+
6. Trademarks.
127+
128+
This License does not grant permission to use the trade names, trademarks,
129+
service marks, or product names of the Licensor, except as required for
130+
reasonable and customary use in describing the origin of the Work and
131+
reproducing the content of the NOTICE file.
132+
133+
7. Disclaimer of Warranty.
134+
135+
Unless required by applicable law or agreed to in writing, Licensor provides the
136+
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
137+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
138+
including, without limitation, any warranties or conditions of TITLE,
139+
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
140+
solely responsible for determining the appropriateness of using or
141+
redistributing the Work and assume any risks associated with Your exercise of
142+
permissions under this License.
143+
144+
8. Limitation of Liability.
145+
146+
In no event and under no legal theory, whether in tort (including negligence),
147+
contract, or otherwise, unless required by applicable law (such as deliberate
148+
and grossly negligent acts) or agreed to in writing, shall any Contributor be
149+
liable to You for damages, including any direct, indirect, special, incidental,
150+
or consequential damages of any character arising as a result of this License or
151+
out of the use or inability to use the Work (including but not limited to
152+
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
153+
any and all other commercial damages or losses), even if such Contributor has
154+
been advised of the possibility of such damages.
155+
156+
9. Accepting Warranty or Additional Liability.
157+
158+
While redistributing the Work or Derivative Works thereof, You may choose to
159+
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
160+
other liability obligations and/or rights consistent with this License. However,
161+
in accepting such obligations, You may act only on Your own behalf and on Your
162+
sole responsibility, not on behalf of any other Contributor, and only if You
163+
agree to indemnify, defend, and hold each Contributor harmless for any liability
164+
incurred by, or claims asserted against, such Contributor by reason of your
165+
accepting any such warranty or additional liability.
166+
167+
END OF TERMS AND CONDITIONS
168+
169+
APPENDIX: How to apply the Apache License to your work
170+
171+
To apply the Apache License to your work, attach the following boilerplate
172+
notice, with the fields enclosed by brackets "[]" replaced with your own
173+
identifying information. (Don't include the brackets!) The text should be
174+
enclosed in the appropriate comment syntax for the file format. We also
175+
recommend that a file or class name and description of purpose be included on
176+
the same "printed page" as the copyright notice for easier identification within
177+
third-party archives.
178+
179+
Copyright [yyyy] [name of copyright owner]
180+
181+
Licensed under the Apache License, Version 2.0 (the "License");
182+
you may not use this file except in compliance with the License.
183+
You may obtain a copy of the License at
184+
185+
http://www.apache.org/licenses/LICENSE-2.0
186+
187+
Unless required by applicable law or agreed to in writing, software
188+
distributed under the License is distributed on an "AS IS" BASIS,
189+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
190+
See the License for the specific language governing permissions and
191+
limitations under the License.

doc/source/api.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2498,6 +2498,20 @@ Scalar introspection
24982498
api.types.is_re_compilable
24992499
api.types.is_scalar
25002500

2501+
Extensions
2502+
----------
2503+
2504+
These are primarily intented for library authors looking to extend pandas
2505+
objects.
2506+
2507+
.. currentmodule:: pandas
2508+
2509+
.. autosummary::
2510+
:toctree: generated/
2511+
2512+
api.extensions.register_dataframe_accessor
2513+
api.extensions.register_series_accessor
2514+
api.extensions.register_index_accessor
25012515

25022516
.. This is to prevent warnings in the doc build. We don't want to encourage
25032517
.. these methods.

doc/source/developer.rst

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,46 @@ As an example of fully-formed metadata:
140140
'metadata': None}
141141
],
142142
'pandas_version': '0.20.0'}
143+
144+
.. _developer.register-accessors:
145+
146+
Registering Custom Accessors
147+
----------------------------
148+
149+
Libraries can use the decorators
150+
:func:`pandas.api.extensions.register_dataframe_accessor`,
151+
:func:`pandas.api.extensions.register_series_accessor`, and
152+
:func:`pandas.api.extensions.register_index_accessor`, to add additional "namespaces" to
153+
pandas objects. All of these follow a similar convention: you decorate a class, providing the name of attribute to add. The
154+
class's `__init__` method gets the object being decorated. For example:
155+
156+
.. ipython:: python
157+
158+
@pd.api.extensions.register_dataframe_accessor("geo")
159+
class GeoAccessor(object):
160+
def __init__(self, pandas_obj):
161+
self._obj = pandas_obj
162+
163+
@property
164+
def center(self):
165+
# return the geographic center point of this DataFarme
166+
lon = self._obj.latitude
167+
lat = self._obj.longitude
168+
return (float(lon.mean()), float(lat.mean()))
169+
170+
def plot(self):
171+
# plot this array's data on a map, e.g., using Cartopy
172+
pass
173+
174+
Now users can access your methods using the `geo` namespace:
175+
176+
>>> ds = pd.DataFrame({'longitude': np.linspace(0, 10),
177+
... 'latitude': np.linspace(0, 20)})
178+
>>> ds.geo.center
179+
(5.0, 10.0)
180+
>>> ds.geo.plot()
181+
# plots data on a map
182+
183+
This can be a convenient way to extend pandas objects without subclassing them.
184+
If you write a custom accessor, make a pull request adding it to our
185+
:ref:`ecosystem` page.

doc/source/internals.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ Subclassing pandas Data Structures
100100

101101
2. Use *composition*. See `here <http://en.wikipedia.org/wiki/Composition_over_inheritance>`_.
102102

103+
3. Extending by :ref:`registering an accessor <internals.register-accessors>`
104+
103105
This section describes how to subclass ``pandas`` data structures to meet more specific needs. There are 2 points which need attention:
104106

105107
1. Override constructor properties.

doc/source/io.rst

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ squeeze : boolean, default ``False``
149149
prefix : str, default ``None``
150150
Prefix to add to column numbers when no header, e.g. 'X' for X0, X1, ...
151151
mangle_dupe_cols : boolean, default ``True``
152-
Duplicate columns will be specified as 'X.0'...'X.N', rather than 'X'...'X'.
152+
Duplicate columns will be specified as 'X', 'X.1'...'X.N', rather than 'X'...'X'.
153153
Passing in False will cause data to be overwritten if there are duplicate
154154
names in the columns.
155155

@@ -548,7 +548,7 @@ these names so as to prevent data overwrite:
548548
pd.read_csv(StringIO(data))
549549
550550
There is no more duplicate data because ``mangle_dupe_cols=True`` by default, which modifies
551-
a series of duplicate columns 'X'...'X' to become 'X.0'...'X.N'. If ``mangle_dupe_cols
551+
a series of duplicate columns 'X'...'X' to become 'X', 'X.1',...'X.N'. If ``mangle_dupe_cols
552552
=False``, duplicate data can arise:
553553

554554
.. code-block :: python
@@ -2228,9 +2228,10 @@ round-trippable manner.
22282228
new_df
22292229
new_df.dtypes
22302230
2231-
Please note that the string `index` is not supported with the round trip
2232-
format, as it is used by default in ``write_json`` to indicate a missing index
2233-
name.
2231+
Please note that the literal string 'index' as the name of an :class:`Index`
2232+
is not round-trippable, nor are any names beginning with 'level_' within a
2233+
:class:`MultiIndex`. These are used by default in :func:`DataFrame.to_json` to
2234+
indicate missing values and the subsequent read cannot distinguish the intent.
22342235

22352236
.. ipython:: python
22362237

doc/source/whatsnew/v0.23.0.txt

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,13 @@ Other Enhancements
202202
- ``Resampler`` objects now have a functioning :attr:`~pandas.core.resample.Resampler.pipe` method.
203203
Previously, calls to ``pipe`` were diverted to the ``mean`` method (:issue:`17905`).
204204
- :func:`~pandas.api.types.is_scalar` now returns ``True`` for ``DateOffset`` objects (:issue:`18943`).
205+
- Added :func:`pandas.api.extensions.register_dataframe_accessor`,
206+
:func:`pandas.api.extensions.register_series_accessor`, and
207+
:func:`pandas.api.extensions.register_index_accessor`, accessor for libraries downstream of pandas
208+
to register custom accessors like ``.cat`` on pandas objects. See
209+
:ref:`Registering Custom Accessors <developer.register-accessors>` for more (:issue:`14781`).
210+
211+
205212
- ``IntervalIndex.astype`` now supports conversions between subtypes when passed an ``IntervalDtype`` (:issue:`19197`)
206213

207214
.. _whatsnew_0230.api_breaking:
@@ -225,6 +232,34 @@ If installed, we now require:
225232
| openpyxl | 2.4.0 | |
226233
+-----------------+-----------------+----------+
227234

235+
.. _whatsnew_0230.api_breaking.deprecate_panel:
236+
237+
Deprecate Panel
238+
^^^^^^^^^^^^^^^
239+
240+
``Panel`` was deprecated in the 0.20.x release, showing as a ``DeprecationWarning``. Using ``Panel`` will now show a ``FutureWarning``. The recommended way to represent 3-D data are
241+
with a ``MultiIndex`` on a ``DataFrame`` via the :meth:`~Panel.to_frame` or with the `xarray package <http://xarray.pydata.org/en/stable/>`__. Pandas
242+
provides a :meth:`~Panel.to_xarray` method to automate this conversion. For more details see :ref:`Deprecate Panel <dsintro.deprecate_panel>` documentation. (:issue:`13563`, :issue:`18324`).
243+
244+
.. ipython:: python
245+
:okwarning:
246+
247+
p = tm.makePanel()
248+
p
249+
250+
Convert to a MultiIndex DataFrame
251+
252+
.. ipython:: python
253+
254+
p.to_frame()
255+
256+
Convert to an xarray DataArray
257+
258+
.. ipython:: python
259+
:okwarning:
260+
261+
p.to_xarray()
262+
228263

229264
Build Changes
230265
^^^^^^^^^^^^^
@@ -272,6 +307,9 @@ Other API Changes
272307
- :class:`IntervalIndex` and ``IntervalDtype`` no longer support categorical, object, and string subtypes (:issue:`19016`)
273308
- The default ``Timedelta`` constructor now accepts an ``ISO 8601 Duration`` string as an argument (:issue:`19040`)
274309
- ``IntervalDtype`` now returns ``True`` when compared against ``'interval'`` regardless of subtype, and ``IntervalDtype.name`` now returns ``'interval'`` regardless of subtype (:issue:`18980`)
310+
- :func:`Series.to_csv` now accepts a ``compression`` argument that works in the same way as the ``compression`` argument in :func:`DataFrame.to_csv` (:issue:`18958`)
311+
- Addition or subtraction of ``NaT`` from :class:`TimedeltaIndex` will return ``TimedeltaIndex`` instead of ``DatetimeIndex`` (:issue:`19124`)
312+
- :func:`DatetimeIndex.shift` and :func:`TimedeltaIndex.shift` will now raise ``NullFrequencyError`` (which subclasses ``ValueError``, which was raised in older versions) when the index object frequency is ``None`` (:issue:`19147`)
275313

276314
.. _whatsnew_0230.deprecations:
277315

@@ -289,6 +327,7 @@ Deprecations
289327
- :func:`read_excel` has deprecated the ``skip_footer`` parameter. Use ``skipfooter`` instead (:issue:`18836`)
290328
- The ``is_copy`` attribute is deprecated and will be removed in a future version (:issue:`18801`).
291329

330+
292331
.. _whatsnew_0230.prior_deprecations:
293332

294333
Removal of prior version deprecations/changes
@@ -385,10 +424,13 @@ Conversion
385424
- Bug in :class:`WeekOfMonth` and :class:`LastWeekOfMonth` where default keyword arguments for constructor raised ``ValueError`` (:issue:`19142`)
386425
- Bug in localization of a naive, datetime string in a ``Series`` constructor with a ``datetime64[ns, tz]`` dtype (:issue:`174151`)
387426
- :func:`Timestamp.replace` will now handle Daylight Savings transitions gracefully (:issue:`18319`)
427+
- Bug in :class:`Index` multiplication and division methods where operating with a ``Series`` would return an ``Index`` object instead of a ``Series`` object (:issue:`19042`)
388428

389429

390-
430+
-
431+
-
391432
- Bug in ``.astype()`` to non-ns timedelta units would hold the incorrect dtype (:issue:`19176`, :issue:`19223`, :issue:`12425`)
433+
- Bug in subtracting :class:`Series` from ``NaT`` incorrectly returning ``NaT`` (:issue:`19158`)
392434

393435

394436
Indexing
@@ -453,6 +495,8 @@ Reshaping
453495
^^^^^^^^^
454496

455497
- Bug in :func:`DataFrame.stack` which fails trying to sort mixed type levels under Python 3 (:issue:`18310`)
498+
- Bug in :func:`DataFrame.unstack` which casts int to float if ``columns`` is a ``MultiIndex`` with unused levels (:issue:`17845`)
499+
- Bug in :func:`DataFrame.unstack` which raises an error if ``index`` is a ``MultiIndex`` with unused labels on the unstacked level (:issue:`18562`)
456500
- Fixed construction of a :class:`Series` from a ``dict`` containing ``NaN`` as key (:issue:`18480`)
457501
- Bug in :func:`Series.rank` where ``Series`` containing ``NaT`` modifies the ``Series`` inplace (:issue:`18521`)
458502
- Bug in :func:`cut` which fails when using readonly arrays (:issue:`18773`)

0 commit comments

Comments
 (0)