Skip to content

TYP: Arraylike #31574

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.

Sign up for GitHub

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

Closed
wants to merge 24 commits into from
Closed

TYP: Arraylike #31574

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
54f2c52
TYP: Arraylike
jbrockmendel Jan 31, 2020
b339215
Merge remote-tracking branch 'upstream/master' into arraylike
simonjayhawkins Feb 2, 2020
60567d2
mypy fixup
simonjayhawkins Feb 2, 2020
1ec8da0
Merge remote-tracking branch 'upstream/master' into arraylike
simonjayhawkins Mar 19, 2020
f01f4b1
mypy/isort fixup
simonjayhawkins Mar 19, 2020
7212b5a
Merge remote-tracking branch 'upstream/master' into arraylike
simonjayhawkins Apr 10, 2020
5f5231d
mypy fixup
simonjayhawkins Apr 10, 2020
42a178f
revert add itemsize to EA interface
simonjayhawkins Apr 10, 2020
a6cc70c
revert changes to pytables
simonjayhawkins Apr 10, 2020
ead6793
Merge remote-tracking branch 'upstream/master' into arraylike
simonjayhawkins Apr 10, 2020
9f03c51
Merge remote-tracking branch 'upstream/master' into arraylike
simonjayhawkins Apr 10, 2020
3db3dca
Merge remote-tracking branch 'upstream/master' into arraylike
simonjayhawkins Apr 11, 2020
f7fca6e
unsed classes following merge upsteam
simonjayhawkins Apr 11, 2020
c987bc2
whitespace
simonjayhawkins Apr 11, 2020
384ac32
troubleshoot test failure
simonjayhawkins Apr 11, 2020
6984eaf
restore replace lambda
simonjayhawkins Apr 11, 2020
c0772a2
AssertionError -> TypeError
simonjayhawkins Apr 11, 2020
074bbd4
more test changes
simonjayhawkins Apr 11, 2020
f6db38f
Merge remote-tracking branch 'upstream/master' into arraylike
simonjayhawkins Apr 22, 2020
0b66334
revert changes to 'debugging' asserts that were tested
simonjayhawkins Apr 22, 2020
cdb39f2
fixup tests
simonjayhawkins Apr 22, 2020
1ba670d
Merge remote-tracking branch 'upstream/master' into arraylike
simonjayhawkins Apr 24, 2020
ff2ff9c
Merge remote-tracking branch 'upstream/master' into arraylike
simonjayhawkins Apr 27, 2020
3d6f7a6
fix doc failures
simonjayhawkins Apr 27, 2020
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 arraylike
  • Loading branch information
@simonjayhawkins
simonjayhawkins committed Feb 2, 2020
commit b33921537cf5fc6e57a093e230a49f08371fd321
2 changes: 1 addition & 1 deletion pandas/core/ops/array_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import numpy as np

from pandas._libs import Timestamp, lib, ops as libops
from pandas._libs import Timedelta, Timestamp, lib, ops as libops
from pandas._typing import ArrayLike

from pandas.core.dtypes.cast import (
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.