8000 REF: Stop mixing DTA/TDA into DTI/TDI by jbrockmendel · Pull Request #24476 · pandas-dev/pandas · GitHub
[go: up one dir, main page]

Skip to content

REF: Stop mixing DTA/TDA into DTI/TDI #24476

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 25 commits into from
Dec 29, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
350b0ec
implement _index_data parts of #24024
jbrockmendel Dec 21, 2018
837c16a
implement _eadata, dispatch arithmetic methods to it
jbrockmendel Dec 21, 2018
e28ff51
dont mix DatetimeLikeArrayMixin into DatetimeIndexOpsMixin
jbrockmendel Dec 21, 2018
ba61a0d
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 21, 2018
fdf1770
dont inherit TimedeltaIndex from TimedeltaArray
jbrockmendel Dec 21, 2018
ed9e1de
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 21, 2018
ea3965d
dont inherit from DatetimeArray
jbrockmendel Dec 22, 2018
8ceab31
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 22, 2018
5b95d78
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 24, 2018
60cd35d
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 24, 2018
bbbd778
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 28, 2018
238b386
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 28, 2018
9d01424
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 28, 2018
a5e5d65
use ea_passthrough
jbrockmendel Dec 28, 2018
21833f3
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 28, 2018
1ff0c4d
remove previously-overriden overridings
jbrockmendel Dec 28, 2018
3faed22
stop double-mixing
jbrockmendel Dec 28, 2018
e607edd
stop over-writing
jbrockmendel Dec 28, 2018
38e4bca
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 28, 2018
2afd6ab
handle+test object arrays
jbrockmendel Dec 29, 2018
43a162e
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 29, 2018
9ddf4bd
Remove unused import
jbrockmendel Dec 29, 2018
11dcef0
flake8 fixup
jbrockmendel Dec 29, 2018
6627f56
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Dec 29, 2018
f6a8951
edits per comments
jbrockmendel Dec 29, 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
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
…dex_data2
  • Loading branch information
jbrockmendel committed Dec 24, 2018
commit 5b95d78d5ba070109e2d9f304550d2fea548b41f
34 changes: 0 additions & 34 deletions pandas/core/arrays/datetimelike.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,40 +125,6 @@ def strftime(self, date_format):
"""
from pandas import Index
return Index(self._format_native_types(date_format=date_format))
strftime.__doc__ = """
Convert to Index using specified date_format.

Return an Index of formatted strings specified by date_format, which
supports the same string format as the python standard library. Details
of the string format can be found in `python string format doc <{0}>`__

Parameters
----------
date_format : str
Date format string (e.g. "%Y-%m-%d").

Returns
-------
Index
Index of formatted strings

See Also
--------
to_datetime : Convert the given argument to datetime.
DatetimeIndex.normalize : Return DatetimeIndex with times to midnight.
DatetimeIndex.round : Round the DatetimeIndex to the specified freq.
DatetimeIndex.floor : Floor the DatetimeIndex to the specified freq.

Examples
--------
>>> rng = pd.date_range(pd.Timestamp("2018-03-10 09:00"),
... periods=3, freq='s')
>>> rng.strftime('%B %d, %Y, %r')
Index(['March 10, 2018, 09:00:00 AM', 'March 10, 2018, 09:00:01 AM',
'March 10, 2018, 09:00:02 AM'],
dtype='object')
""".format("https://docs.python.org/3/library/datetime.html"
"#strftime-and-strptime-behavior")


class TimelikeOps(object):
Expand Down
2 changes: 2 additions & 0 deletions pandas/core/indexes/datetimelike.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ def wrapper(self, other):
wrapper.__name__ = '__{}__'.format(op.__name__)
return wrapper

# ------------------------------------------------------------------------

def equals(self, other):
"""
Determines if two Index objects contain the same elements.
Expand Down
4 changes: 0 additions & 4 deletions pandas/core/indexes/period.py
Original file line number Diff line number Diff line change
Expand Up @@ -883,10 +883,6 @@ def __setstate__(self, state):

_unpickle_compat = __setstate__

def repeat(self, repeats, *args, **kwargs):
# TODO(DatetimeArray): Just use Index.repeat
return Index.repeat(self, repeats, *args, **kwargs)

def view(self, dtype=None, type=None):
# TODO(DatetimeArray): remove
if dtype is None or dtype is __builtins__['type'](self):
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0