Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
df9f894
implement DatetimeLikeArray
jbrockmendel Feb 26, 2018
004f137
docstring
jbrockmendel Feb 26, 2018
db72494
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Feb 27, 2018
80b525e
move classes to array directory
jbrockmendel Feb 27, 2018
54009d4
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Feb 27, 2018
65dc829
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Feb 27, 2018
4c5a05c
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Feb 28, 2018
b91ddac
flake8 fixup remove unused import
jbrockmendel Mar 1, 2018
080e477
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Mar 2, 2018
e19f70a
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Mar 7, 2018
47d365e
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Mar 18, 2018
3a67bce
comments for cache_readonlys, append Mixin to name, add imports to __…
jbrockmendel Mar 18, 2018
7fc73eb
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Apr 6, 2018
9edd9bc
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Apr 11, 2018
1236273
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Apr 24, 2018
1ab6263
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Apr 26, 2018
9a28188
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel May 16, 2018
6b17031
fix merge screwup
jbrockmendel May 17, 2018
b03689a
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel May 25, 2018
a055d40
rename arrays to FooArray Mixin
jbrockmendel May 25, 2018
d1faeb6
fixups imports
jbrockmendel May 25, 2018
fcb8d6a
fixup namerror
jbrockmendel May 25, 2018
8cee92c
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel May 26, 2018
375329e
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jun 4, 2018
71dfe08
fixup missing import
jbrockmendel Jun 4, 2018
59c60a2
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jun 7, 2018
9db2b78
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jun 10, 2018
308c25b
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jun 11, 2018
94bdfcb
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jun 20, 2018
d589e2a
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jun 22, 2018
0d4f48a
reorder imports
jbrockmendel Jun 22, 2018
1b910c7
De-pluralize
jbrockmendel Jun 22, 2018
cece116
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jun 28, 2018
828022a
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jun 29, 2018
ed83046
fixup remove unused import
jbrockmendel Jun 29, 2018
c1934db
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jun 29, 2018
a684c2d
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel Jul 2, 2018
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
fixups imports
  • Loading branch information
jbrockmendel committed May 25, 2018
commit d1faeb69359bd50b7bc6d5288904d06c870e4ea1
6 changes: 3 additions & 3 deletions pandas/core/arrays/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .base import ExtensionArray # noqa
from .categorical import Categorical # noqa
from .datetimes import DatetimeArray # noqa
from .periods import PeriodArray # noqa
from .timedeltas import TimedeltaArray # noqa
from .datetimes import DatetimeArrayMixin # noqa
from .periods import PeriodArrayMixin # noqa
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you make this period? and below timedelta
I am fine with keeping the conflicting one as plural, if you want that

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which is "the conflicting one"?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I was speaking about the file name, not the order. So to use singular period instead of periods (and same for timedelta), as we discussed about before: https://github.com/pandas-dev/pandas/pull/19902/files/3a67bce8169663430005b2a36673132fc1e79f4c#r175774283

from .timedeltas import TimedeltaArrayMixin # noqa