Skip to content

Commit 4f6ef00

Browse files
committed
Merge branch 'master' into nui-regression
2 parents 535847c + 67c9385 commit 4f6ef00

File tree

169 files changed

+4085
-1834
lines changed

Some content is hidden

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

169 files changed

+4085
-1834
lines changed

LICENSES/PACKAGING_LICENSE

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

asv_bench/benchmarks/algos/isin.py

+14
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
date_range,
1010
)
1111

12+
from ..pandas_vb_common import tm
13+
1214

1315
class IsIn:
1416

@@ -22,6 +24,9 @@ class IsIn:
2224
"datetime64[ns]",
2325
"category[object]",
2426
"category[int]",
27+
"str",
28+
"string",
29+
"arrow_string",
2530
]
2631
param_names = ["dtype"]
2732

@@ -57,6 +62,15 @@ def setup(self, dtype):
5762
self.values = np.random.choice(arr, sample_size)
5863
self.series = Series(arr).astype("category")
5964

65+
elif dtype in ["str", "string", "arrow_string"]:
66+
from pandas.core.arrays.string_arrow import ArrowStringDtype # noqa: F401
67+
68+
try:
69+
self.series = Series(tm.makeStringIndex(N), dtype=dtype)
70+
except ImportError:
71+
raise NotImplementedError
72+
self.values = list(self.series[:2])
73+
6074
else:
6175
self.series = Series(np.random.randint(1, 10, N)).astype(dtype)
6276
self.values = [1, 2]

asv_bench/benchmarks/frame_methods.py

+8
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,14 @@ def time_frame_nunique(self):
563563
self.df.nunique()
564564

565565

566+
class SeriesNuniqueWithNan:
567+
def setup(self):
568+
self.ser = Series(100000 * (100 * [np.nan] + list(range(100)))).astype(float)
569+
570+
def time_series_nunique_nan(self):
571+
self.ser.nunique()
572+
573+
566574
class Duplicated:
567575
def setup(self):
568576
n = 1 << 20

asv_bench/benchmarks/io/style.py

+21-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import numpy as np
22

3-
from pandas import DataFrame
3+
from pandas import (
4+
DataFrame,
5+
IndexSlice,
6+
)
47

58

69
class Render:
@@ -31,6 +34,14 @@ def peakmem_classes_render(self, cols, rows):
3134
self._style_classes()
3235
self.st._render_html()
3336

37+
def time_format_render(self, cols, rows):
38+
self._style_format()
39+
self.st.render()
40+
41+
def peakmem_format_render(self, cols, rows):
42+
self._style_format()
43+
self.st.render()
44+
3445
def _style_apply(self):
3546
def _apply_func(s):
3647
return [
@@ -43,3 +54,12 @@ def _style_classes(self):
4354
classes = self.df.applymap(lambda v: ("cls-1" if v > 0 else ""))
4455
classes.index, classes.columns = self.df.index, self.df.columns
4556
self.st = self.df.style.set_td_classes(classes)
57+
58+
def _style_format(self):
59+
ic = int(len(self.df.columns) / 4 * 3)
60+
ir = int(len(self.df.index) / 4 * 3)
61+
# apply a formatting function
62+
# subset is flexible but hinders vectorised solutions
63+
self.st = self.df.style.format(
64+
"{:,.3f}", subset=IndexSlice["row_1":f"row_{ir}", "float_1":f"float_{ic}"]
65+
)

ci/code_checks.sh

+12-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# $ ./ci/code_checks.sh code # checks on imported code
1616
# $ ./ci/code_checks.sh doctests # run doctests
1717
# $ ./ci/code_checks.sh docstrings # validate docstring errors
18-
# $ ./ci/code_checks.sh typing # run static type analysis
18+
# $ ./ci/code_checks.sh typing # run static type analysis
1919

2020
[[ -z "$1" || "$1" == "lint" || "$1" == "patterns" || "$1" == "code" || "$1" == "doctests" || "$1" == "docstrings" || "$1" == "typing" ]] || \
2121
{ echo "Unknown command $1. Usage: $0 [lint|patterns|code|doctests|docstrings|typing]"; exit 9999; }
@@ -123,6 +123,11 @@ if [[ -z "$CHECK" || "$CHECK" == "doctests" ]]; then
123123

124124
MSG='Doctests for directories' ; echo $MSG
125125
pytest -q --doctest-modules \
126+
pandas/_libs/ \
127+
pandas/api/ \
128+
pandas/arrays/ \
129+
pandas/compat/ \
130+
pandas/core/array_algos/ \
126131
pandas/core/arrays/ \
127132
pandas/core/computation/ \
128133
pandas/core/dtypes/ \
@@ -133,6 +138,12 @@ if [[ -z "$CHECK" || "$CHECK" == "doctests" ]]; then
133138
pandas/core/strings/ \
134139
pandas/core/tools/ \
135140
pandas/core/window/ \
141+
pandas/errors/ \
142+
pandas/io/clipboard/ \
143+
pandas/io/json/ \
144+
pandas/io/excel/ \
145+
pandas/io/parsers/ \
146+
pandas/io/sas/ \
136147
pandas/tseries/
137148
RET=$(($RET + $?)) ; echo $MSG "DONE"
138149

ci/deps/actions-37-db.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
- beautifulsoup4
1616
- botocore>=1.11
1717
- dask
18-
- fastparquet>=0.4.0
18+
- fastparquet>=0.4.0, <=0.5.0
1919
- fsspec>=0.7.4
2020
- gcsfs>=0.6.0
2121
- geopandas

ci/deps/azure-windows-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dependencies:
1515
# pandas dependencies
1616
- blosc
1717
- bottleneck
18-
- fastparquet>=0.4.0
18+
- fastparquet>=0.4.0, <=0.5.0
1919
- flask
2020
- fsspec>=0.8.0
2121
- matplotlib=3.1.3

doc/source/user_guide/categorical.rst

+1
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,7 @@ categorical (categories and ordering). So if you read back the CSV file you have
954954
relevant columns back to ``category`` and assign the right categories and categories ordering.
955955

956956
.. ipython:: python
957+
:okwarning:
957958
958959
import io
959960

doc/source/user_guide/options.rst

+4
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,10 @@ io.hdf.dropna_table True drop ALL nan rows when appe
456456
io.parquet.engine None The engine to use as a default for
457457
parquet reading and writing. If None
458458
then try 'pyarrow' and 'fastparquet'
459+
io.sql.engine None The engine to use as a default for
460+
sql reading and writing, with SQLAlchemy
461+
as a higher level interface. If None
462+
then try 'sqlalchemy'
459463
mode.chained_assignment warn Controls ``SettingWithCopyWarning``:
460464
'raise', 'warn', or None. Raise an
461465
exception, warn, or no action if

0 commit comments

Comments
 (0)