-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
fix bug when combining groupby with resample and interpolate with dat… #35360
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
fix bug when combining groupby with resample and interpolate with dat… #35360
Conversation
…etime-index (GH 35325)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
Thanks @CloseChoice for the PR. The test failures should be fixed on master. can you merge upstream/master. |
…x_groupby_resample_interpolate
Done, though I am not quite sure if my whatsnew entry is correct. There seemed to be some problems with building the documentation. I also had a similar issue on another PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Release note might need to be moved to 1.2 (see #34730)
doc/source/whatsnew/v1.1.0.rst
Outdated
@@ -1132,6 +1132,7 @@ Groupby/resample/rolling | |||
- Bug in :meth:`core.groupby.DataFrameGroupBy.transform` when ``func='nunique'`` and columns are of type ``datetime64``, the result would also be of type ``datetime64`` instead of ``int64`` (:issue:`35109`) | |||
- Bug in :meth:`DataFrame.groupby` raising an ``AttributeError`` when selecting a column and aggregating with ``as_index=False`` (:issue:`35246`). | |||
- Bug in :meth:'DataFrameGroupBy.first' and :meth:'DataFrameGroupBy.last' that would raise an unnecessary ``ValueError`` when grouping on multiple ``Categoricals`` (:issue:`34951`) | |||
- Bug when combining methods :meth:`DataFrame.groupby` with :meth:`DataFrame.resample` and :meth:`DataFrame.interpolate` raising an ``TypeError`` (:issue:`35325`) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I might do
- Bug in `meth`:`Resampler.interpolate` when combining with :meth:`DataFrame.groupby`, :meth:`DataFrame.resample` was raising a ``TypeError`` (:issue:`35325`)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Release note might need to be moved to 1.2 (see #34730)
Thanks for the link. I was looking for the whatsnew 1.2 but have seen that the PR, which will add this, is still open.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
has now been merged
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks ok, can you merge master and ping on green (after change)
@@ -346,3 +346,65 @@ def test_median_duplicate_columns(): | |||
result = df.resample("5s").median() | |||
expected.columns = result.columns | |||
tm.assert_frame_equal(result, expected) | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you move this to pandas/tests/resample/test_time_grouper.py
doc/source/whatsnew/v1.2.0.rst
Outdated
@@ -152,10 +152,14 @@ Plotting | |||
Groupby/resample/rolling | |||
^^^^^^^^^^^^^^^^^^^^^^^^ | |||
|
|||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you remove the rebase markers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
…x_groupby_resample_interpolate
…x_groupby_resample_interpolate
…x_groupby_resample_interpolate
thanks @CloseChoice very nice |
…etime-index (GH 35325)
black pandas
git diff upstream/master -u -- "*.py" | flake8 --diff