Skip to content

Commit db409f1

Browse files
author
auderson
committed
Merge remote-tracking branch 'upstream/main' into same_val_counts_for_roll_skew_kurt
2 parents 074e846 + 32999a1 commit db409f1

Some content is hidden

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

69 files changed

+1264
-780
lines changed

.pre-commit-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,13 @@ repos:
176176
files: ^pandas/core/
177177
exclude: ^pandas/core/api\.py$
178178
types: [python]
179+
- id: use-io-common-urlopen
180+
name: Use pandas.io.common.urlopen instead of urllib.request.urlopen
181+
language: python
182+
entry: python scripts/use_io_common_urlopen.py
183+
files: ^pandas/
184+
exclude: ^pandas/tests/
185+
types: [python]
179186
- id: no-bool-in-core-generic
180187
name: Use bool_t instead of bool in pandas/core/generic.py
181188
entry: python scripts/no_bool_in_generic.py

LICENSES/KLIB_LICENSE

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
The MIT License
2+
3+
Copyright (c) 2008- Attractive Chaos <attractor@live.co.uk>
4+
5+
Permission is hereby granted, free of charge, to any person obtaining
6+
a copy of this software and associated documentation files (the
7+
"Software"), to deal in the Software without restriction, including
8+
without limitation the rights to use, copy, modify, merge, publish,
9+
distribute, sublicense, and/or sell copies of the Software, and to
10+
permit persons to whom the Software is furnished to do so, subject to
11+
the following conditions:
12+
13+
The above copyright notice and this permission notice shall be
14+
included in all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
20+
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
21+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
22+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
23+
SOFTWARE.

MANIFEST.in

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include RELEASE.md
2+
include versioneer.py
23

34
graft doc
45
prune doc/build
@@ -54,9 +55,6 @@ global-exclude *.pxi
5455
# exclude the whole directory to avoid running related tests in sdist
5556
prune pandas/tests/io/parser/data
5657

57-
include versioneer.py
58-
include pandas/_version.py
59-
include pandas/io/formats/templates/*.tpl
60-
58+
# Selectively re-add *.cxx files that were excluded above
6159
graft pandas/_libs/src
6260
graft pandas/_libs/tslibs/src

ci/deps/actions-310.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dependencies:
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.31
12-
- hypothesis>=5.5.3
1312
- psutil
1413
- pytest-asyncio>=0.17
1514
- boto3
@@ -27,6 +26,7 @@ dependencies:
2726
- fastparquet
2827
- fsspec
2928
- html5lib
29+
- hypothesis
3030
- gcsfs
3131
- jinja2
3232
- lxml

ci/deps/actions-38-downstream_compat.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ dependencies:
1010
- pytest>=6.0
1111
- pytest-cov
1212
- pytest-xdist>=1.31
13-
- hypothesis>=5.5.3
1413
- psutil
1514
- pytest-asyncio>=0.17
1615
- boto3
@@ -28,6 +27,7 @@ dependencies:
2827
- fastparquet
2928
- fsspec
3029
- html5lib
30+
- hypothesis
3131
- gcsfs
3232
- jinja2
3333
- lxml

ci/deps/actions-38-minimum_versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies:
1111
- pytest>=6.0
1212
- pytest-cov
1313
- pytest-xdist>=1.31
14-
- hypothesis>=5.5.3
1514
- psutil
1615
- pytest-asyncio>=0.17
1716
- boto3
@@ -29,6 +28,7 @@ dependencies:
2928
- fastparquet=0.4.0
3029
- fsspec=0.7.4
3130
- html5lib=1.1
31+
- hypothesis=5.5.3
3232
- gcsfs=0.6.0
3333
- jinja2=2.11
3434
- lxml=4.5.0

ci/deps/actions-38.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dependencies:
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.31
12-
- hypothesis>=5.5.3
1312
- psutil
1413
- pytest-asyncio>=0.17
1514
- boto3
@@ -27,6 +26,7 @@ dependencies:
2726
- fastparquet
2827
- fsspec
2928
- html5lib
29+
- hypothesis
3030
- gcsfs
3131
- jinja2
3232
- lxml

ci/deps/actions-39.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dependencies:
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.31
12-
- hypothesis>=5.5.3
1312
- psutil
1413
- pytest-asyncio>=0.17
1514
- boto3
@@ -27,6 +26,7 @@ dependencies:
2726
- fastparquet
2827
- fsspec
2928
- html5lib
29+
- hypothesis
3030
- gcsfs
3131
- jinja2
3232
- lxml

ci/deps/circle-38-arm64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ dependencies:
99
- pytest>=6.0
1010
- pytest-cov
1111
- pytest-xdist>=1.31
12-
- hypothesis>=5.5.3
1312
- psutil
1413
- pytest-asyncio>=0.17
1514
- boto3
@@ -27,6 +26,7 @@ dependencies:
2726
- fastparquet
2827
- fsspec
2928
- html5lib
29+
- hypothesis
3030
- gcsfs
3131
- jinja2
3232
- lxml

doc/source/development/code_style.rst

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)