Skip to content

[ArrayManager] REF: Implement concat with reindexing #39612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 34 commits into from
Apr 12, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
6cd1c4d
[ArrayManager] Implement concat with reindexing
jorisvandenbossche Feb 5, 2021
73d9de2
fix mypy
jorisvandenbossche Feb 5, 2021
272d674
pass through allow dups
jorisvandenbossche Feb 5, 2021
555d7ac
simplify _array_from_proxy
jorisvandenbossche Feb 5, 2021
ebad8a4
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Feb 8, 2021
ee495e5
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Feb 9, 2021
19c7f75
fix creation empty + turn into method
jorisvandenbossche Feb 9, 2021
42e1b05
remove overriding of fill_value
jorisvandenbossche Feb 10, 2021
724be3e
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Feb 10, 2021
db3f0ed
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Feb 12, 2021
a2aa388
use ensure_dtype_can_hold_na
jorisvandenbossche Feb 12, 2021
6bdd175
add type annotation
jorisvandenbossche Feb 12, 2021
910e1fe
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Feb 15, 2021
cab90f6
address review
jorisvandenbossche Feb 15, 2021
c22a010
update comment
jorisvandenbossche Feb 15, 2021
eec0161
fixup test
jorisvandenbossche Feb 15, 2021
6c69869
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Mar 18, 2021
04ead63
update/remove skips
jorisvandenbossche Mar 18, 2021
427b6f4
move logic into internals
jorisvandenbossche Mar 18, 2021
8c10a53
fix typing
jorisvandenbossche Mar 18, 2021
ec5bd11
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Mar 23, 2021
f0061f7
update type check
jorisvandenbossche Mar 23, 2021
9ba8854
simply casting to_concat + fix skips
jorisvandenbossche Mar 23, 2021
ad61f2f
further simplify concat_arrays
jorisvandenbossche Mar 23, 2021
d960619
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Mar 24, 2021
a3c2662
remove redundant cast
jorisvandenbossche Mar 24, 2021
0fafb1a
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Mar 31, 2021
f67e9e2
simplify usage of find_common_type
jorisvandenbossche Mar 31, 2021
f655e33
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Mar 31, 2021
d21bd3a
update annotation
jorisvandenbossche Mar 31, 2021
9435c39
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Apr 2, 2021
22ea7d2
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Apr 7, 2021
77b05f4
fixup typing
jorisvandenbossche Apr 7, 2021
81d0954
Merge remote-tracking branch 'upstream/master' into am-concat
jorisvandenbossche Apr 12, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/master' into am-concat
  • Loading branch information
jorisvandenbossche committed Mar 23, 2021
commit ec5bd11d0131dad47fdf852651b310a7aef58e7a
37 changes: 2 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,38 +161,5 @@ jobs:
source activate pandas-dev
ci/run_tests.sh

pytest pandas/tests/frame/
pytest pandas/tests/reductions/
pytest pandas/tests/generic/test_generic.py
pytest pandas/tests/arithmetic/
pytest pandas/tests/groupby/
pytest pandas/tests/resample/
pytest pandas/tests/reshape/
pytest pandas/tests/series/
pytest pandas/tests/indexing/

pytest pandas/tests/api/
pytest pandas/tests/apply/
pytest pandas/tests/arrays/
pytest pandas/tests/base/
pytest pandas/tests/computation/
pytest pandas/tests/config/
pytest pandas/tests/dtypes/
pytest pandas/tests/extension/
pytest pandas/tests/generic/
pytest pandas/tests/indexes/
pytest pandas/tests/io/test_* -m "not slow and not clipboard"
pytest pandas/tests/io/excel/ -m "not slow and not clipboard"
pytest pandas/tests/io/formats/ -m "not slow and not clipboard"
pytest pandas/tests/io/parser/ -m "not slow and not clipboard"
pytest pandas/tests/io/sas/ -m "not slow and not clipboard"
pytest pandas/tests/io/xml/ -m "not slow and not clipboard"
pytest pandas/tests/libs/
pytest pandas/tests/plotting/
pytest pandas/tests/scalar/
pytest pandas/tests/strings/
pytest pandas/tests/tools/
pytest pandas/tests/tseries/
pytest pandas/tests/tslibs/
pytest pandas/tests/util/
pytest pandas/tests/window/
- name: Print skipped tests
run: python ci/print_skipped.py
2 changes: 0 additions & 2 deletions pandas/tests/reshape/test_crosstab.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import numpy as np
import pytest

import pandas.util._test_decorators as td

from pandas.core.dtypes.common import is_categorical_dtype

from pandas import (
Expand Down
2 changes: 0 additions & 2 deletions pandas/tests/reshape/test_pivot.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
import numpy as np
import pytest

import pandas.util._test_decorators as td

import pandas as pd
from pandas import (
Categorical,
Expand Down
2 changes: 0 additions & 2 deletions pandas/tests/reshape/test_pivot_multilevel.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import numpy as np
import pytest

import pandas.util._test_decorators as td

import pandas as pd
from pandas import (
Index,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.