Skip to content

Commit 315acea

Browse files
Merge remote-tracking branch 'upstream/master' into bisect
2 parents 4f84c88 + a7402c1 commit 315acea

File tree

890 files changed

+12299
-6042
lines changed

Some content is hidden

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

890 files changed

+12299
-6042
lines changed

.github/workflows/ci.yml

+9
Original file line numberDiff line numberDiff line change
@@ -153,3 +153,12 @@ jobs:
153153
run: |
154154
source activate pandas-dev
155155
pytest pandas/tests/frame/methods --array-manager
156+
pytest pandas/tests/arithmetic/ --array-manager
157+
158+
# indexing subset (temporary since other tests don't pass yet)
159+
pytest pandas/tests/frame/indexing/test_indexing.py::TestDataFrameIndexing::test_setitem_boolean --array-manager
160+
pytest pandas/tests/frame/indexing/test_where.py --array-manager
161+
pytest pandas/tests/frame/indexing/test_indexing.py::TestDataFrameIndexing::test_setitem_multi_index --array-manager
162+
pytest pandas/tests/frame/indexing/test_setitem.py::TestDataFrameSetItem::test_setitem_listlike_indexer_duplicate_columns --array-manager
163+
pytest pandas/tests/indexing/multiindex/test_setitem.py::TestMultiIndexSetItem::test_astype_assignment_with_dups --array-manager
164+
pytest pandas/tests/indexing/multiindex/test_setitem.py::TestMultiIndexSetItem::test_frame_setitem_multi_column --array-manager

.github/workflows/database.yml

+8
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,11 @@ jobs:
170170

171171
- name: Print skipped tests
172172
run: python ci/print_skipped.py
173+
174+
- name: Upload coverage to Codecov
175+
uses: codecov/codecov-action@v1
176+
with:
177+
files: /tmp/test_coverage.xml
178+
flags: unittests
179+
name: codecov-pandas
180+
fail_ci_if_error: true

.pre-commit-config.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ repos:
138138
entry: python scripts/check_for_inconsistent_pandas_namespace.py
139139
language: python
140140
types: [python]
141-
files: ^pandas/tests/
141+
files: ^pandas/tests/frame/
142142
- id: FrameOrSeriesUnion
143143
name: Check for use of Union[Series, DataFrame] instead of FrameOrSeriesUnion alias
144144
entry: Union\[.*(Series,.*DataFrame|DataFrame,.*Series).*\]
@@ -180,6 +180,12 @@ repos:
180180
language: pygrep
181181
types: [python]
182182
files: ^pandas/tests/
183+
- id: title-capitalization
184+
name: Validate correct capitalization among titles in documentation
185+
entry: python scripts/validate_rst_title_capitalization.py
186+
language: python
187+
types: [rst]
188+
files: ^doc/source/(development|reference)/
183189
- repo: https://github.com/asottile/yesqa
184190
rev: v1.2.2
185191
hooks:

MANIFEST.in

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
include MANIFEST.in
2-
include LICENSE
31
include RELEASE.md
4-
include README.md
5-
include setup.py
6-
include pyproject.toml
72

83
graft doc
94
prune doc/build
@@ -16,10 +11,12 @@ global-exclude *.bz2
1611
global-exclude *.csv
1712
global-exclude *.dta
1813
global-exclude *.feather
14+
global-exclude *.tar
1915
global-exclude *.gz
2016
global-exclude *.h5
2117
global-exclude *.html
2218
global-exclude *.json
19+
global-exclude *.jsonl
2320
global-exclude *.pickle
2421
global-exclude *.png
2522
global-exclude *.pyc
@@ -40,6 +37,11 @@ global-exclude .DS_Store
4037
global-exclude .git*
4138
global-exclude \#*
4239

40+
# GH 39321
41+
# csv_dir_path fixture checks the existence of the directory
42+
# exclude the whole directory to avoid running related tests in sdist
43+
prune pandas/tests/io/parser/data
44+
4345
include versioneer.py
4446
include pandas/_version.py
4547
include pandas/io/formats/templates/*.tpl

Makefile

-13
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,3 @@ doc:
2525
cd doc; \
2626
python make.py clean; \
2727
python make.py html
28-
29-
check:
30-
python3 scripts/validate_unwanted_patterns.py \
31-
--validation-type="private_function_across_module" \
32-
--included-file-extensions="py" \
33-
--excluded-file-paths=pandas/tests,asv_bench/ \
34-
pandas/
35-
36-
python3 scripts/validate_unwanted_patterns.py \
37-
--validation-type="private_import_across_module" \
38-
--included-file-extensions="py" \
39-
--excluded-file-paths=pandas/tests,asv_bench/,doc/
40-
pandas/
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
"""
2+
algos/ directory is intended for individual functions from core.algorithms
3+
4+
In many cases these algorithms are reachable in multiple ways:
5+
algos.foo(x, y)
6+
Series(x).foo(y)
7+
Index(x).foo(y)
8+
pd.array(x).foo(y)
9+
10+
In most cases we profile the Series variant directly, trusting the performance
11+
of the others to be highly correlated.
12+
"""

0 commit comments

Comments
 (0)