Skip to content

TYP: NDFrame.resample #30947

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

Merged
merged 1 commit into from
Jan 13, 2020
Merged

TYP: NDFrame.resample #30947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
from pandas.core.arrays.datetimelike import DatetimeLikeArrayMixin as DatetimeLikeArray
from pandas.core.arrays.sparse import SparseFrameAccessor
from pandas.core.generic import NDFrame, _shared_docs
from pandas.core.groupby import generic as groupby_generic
from pandas.core.indexes import base as ibase
from pandas.core.indexes.api import Index, ensure_index, ensure_index_from_sequences
from pandas.core.indexes.datetimes import DatetimeIndex
Expand All @@ -129,6 +128,7 @@
import pandas.plotting

if TYPE_CHECKING:
from pandas.core.groupby.generic import DataFrameGroupBy
from pandas.io.formats.style import Styler

# ---------------------------------------------------------------------
Expand Down Expand Up @@ -5777,13 +5777,14 @@ def groupby(
group_keys: bool = True,
squeeze: bool = False,
observed: bool = False,
) -> "groupby_generic.DataFrameGroupBy":
) -> "DataFrameGroupBy":
from pandas.core.groupby.generic import DataFrameGroupBy
Copy link
Member

Choose a reason for hiding this comment

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

Can this no longer be done at the top of the module rather than in the function?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Its not a good idea to import the class at the top because of circular import problems.

There was a discussion in #30314 if the import could be less ugly (generic_groupby is not a module name). This is an attempt to improve on that and makes the import for groupbys and resample more similar to each other.

Copy link
Member

Choose a reason for hiding this comment

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

Gotcha. Generally not a fan of this but I guess somewhat orthogonal


if level is None and by is None:
raise TypeError("You have to supply one of 'by' and 'level'")
axis = self._get_axis_number(axis)

return groupby_generic.DataFrameGroupBy(
return DataFrameGroupBy(
obj=self,
keys=by,
axis=axis,
Expand Down
10 changes: 7 additions & 3 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import re
from textwrap import dedent
from typing import (
TYPE_CHECKING,
Any,
Callable,
Dict,
Expand Down Expand Up @@ -101,6 +102,9 @@
from pandas.io.formats.printing import pprint_thing
from pandas.tseries.frequencies import to_offset

if TYPE_CHECKING:
from pandas.core.resample import Resampler

# goal is to be able to define the docs close to function, while still being
# able to share
_shared_docs: Dict[str, str] = dict()
Expand Down Expand Up @@ -7685,7 +7689,7 @@ def resample(
base: int = 0,
on=None,
level=None,
):
) -> "Resampler":
"""
Resample time-series data.

Expand Down Expand Up @@ -7950,10 +7954,10 @@ def resample(
2000-01-04 36 90
"""

from pandas.core.resample import resample
from pandas.core.resample import get_resampler

axis = self._get_axis_number(axis)
return resample(
return get_resampler(
self,
freq=rule,
label=label,
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/resample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,15 +1262,15 @@ def _constructor(self):
return TimedeltaIndexResampler


def resample(obj, kind=None, **kwds):
def get_resampler(obj, kind=None, **kwds):
"""
Create a TimeGrouper and return our resampler.
"""
tg = TimeGrouper(**kwds)
return tg._get_resampler(obj, kind=kind)


resample.__doc__ = Resampler.__doc__
get_resampler.__doc__ = Resampler.__doc__


def get_resampler_for_grouping(
Expand Down
7 changes: 4 additions & 3 deletions pandas/core/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
is_empty_data,
sanitize_array,
)
from pandas.core.groupby import generic as groupby_generic
from pandas.core.indexers import maybe_convert_indices
from pandas.core.indexes.accessors import CombinedDatetimelikeProperties
from pandas.core.indexes.api import (
Expand All @@ -94,6 +93,7 @@

if TYPE_CHECKING:
from pandas.core.frame import DataFrame
from pandas.core.groupby.generic import SeriesGroupBy

__all__ = ["Series"]

Expand Down Expand Up @@ -1634,13 +1634,14 @@ def groupby(
group_keys: bool = True,
squeeze: bool = False,
observed: bool = False,
) -> "groupby_generic.SeriesGroupBy":
) -> "SeriesGroupBy":
from pandas.core.groupby.generic import SeriesGroupBy

if level is None and by is None:
raise TypeError("You have to supply one of 'by' and 'level'")
axis = self._get_axis_number(axis)

return groupby_generic.SeriesGroupBy(
return SeriesGroupBy(
obj=self,
keys=by,
axis=axis,
Expand Down