Skip to content

REF: remove DatetimeBlock, TimeDeltaBlock #40614

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 21 commits into from
Apr 2, 2021
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fae2a97
REF: back DatetimeBlock, TimedeltaBlock by DTA/TDA
jbrockmendel Mar 16, 2021
c5e3dd9
Merge branch 'master' into ref-hybrid-4
jbrockmendel Mar 16, 2021
7a4d545
Merge branch 'master' into ref-hybrid-4
jbrockmendel Mar 16, 2021
c776390
fix pytables tests
jbrockmendel Mar 16, 2021
62b5806
Merge branch 'master' into ref-hybrid-4
jbrockmendel Mar 16, 2021
c3ce503
exception message shared AM/BM
jbrockmendel Mar 16, 2021
3b0e819
Merge branch 'master' into ref-hybrid-4
jbrockmendel Mar 19, 2021
868f436
Merge branch 'master' into ref-hybrid-4
jbrockmendel Mar 19, 2021
14b4087
Merge branch 'master' into ref-hybrid-4
jbrockmendel Mar 22, 2021
f076370
Merge branch 'master' into ref-hybrid-4
jbrockmendel Mar 22, 2021
d7f2718
nanargminmax with ndim=2 and mask.any()
jbrockmendel Mar 23, 2021
626c2a9
Merge branch 'master' into ref-hybrid-4
jbrockmendel Mar 23, 2021
3fbc3a5
Merge branch 'master' into ref-hybrid-4
jbrockmendel Mar 24, 2021
c7ff237
REF: remove DatetimeBlock, TimeDeltaBlock
jbrockmendel Mar 24, 2021
7d0167c
Merge branch 'master' into ref-hybrid-5
jbrockmendel Mar 27, 2021
0ed97e2
Merge branch 'master' into ref-hybrid-5
jbrockmendel Mar 30, 2021
1a7b015
Merge branch 'master' into ref-hybrid-5
jbrockmendel Mar 31, 2021
4da003b
Merge branch 'master' into ref-hybrid-5
jbrockmendel Mar 31, 2021
4aad27e
Merge branch 'master' into ref-hybrid-5
jbrockmendel Apr 2, 2021
3a5ceeb
Merge branch 'master' into ref-hybrid-5
jbrockmendel Apr 2, 2021
fb18444
mypy fixup
jbrockmendel Apr 2, 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 branch 'master' into ref-hybrid-5
  • Loading branch information
jbrockmendel committed Mar 31, 2021
commit 1a7b0152a590b0cf00b6b99c36b7f02681698460
4 changes: 3 additions & 1 deletion pandas/core/internals/managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1801,7 +1801,9 @@ def _form_blocks(
blocks.extend(numeric_blocks)

if len(items_dict["DatetimeLikeBlock"]):
dtlike_blocks = _multi_blockify(items_dict["DatetimeLikeBlock"])
dtlike_blocks = _multi_blockify(
items_dict["DatetimeLikeBlock"], consolidate=consolidate
)
blocks.extend(dtlike_blocks)

if len(items_dict["DatetimeTZBlock"]):
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.