Skip to content

Conversation

CloseChoice
Copy link
Member

…etime-index (GH 35325)

Copy link
Member

@arw2019 arw2019 left a comment

Choose a reason for hiding this comment

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

lgtm

@simonjayhawkins
Copy link
Member

Thanks @CloseChoice for the PR. The test failures should be fixed on master. can you merge upstream/master.

@CloseChoice
Copy link
Member Author

Thanks @CloseChoice for the PR. The test failures should be fixed on master. can you merge upstream/master.

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.

Copy link
Member

@arw2019 arw2019 left a 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)

@@ -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`)
Copy link
Member

@arw2019 arw2019 Jul 22, 2020

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`)

Copy link
Member Author

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.

Copy link
Member

Choose a reason for hiding this comment

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

has now been merged

Copy link
Contributor

@jreback jreback left a 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)

Copy link
Contributor

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

@jreback jreback added Groupby Missing-data np.nan, pd.NaT, pd.NA, dropna, isnull, interpolate Resample resample method labels Aug 6, 2020
@jreback jreback added this to the 1.2 milestone Aug 7, 2020
@@ -152,10 +152,14 @@ Plotting
Groupby/resample/rolling
^^^^^^^^^^^^^^^^^^^^^^^^

<<<<<<< HEAD
Copy link
Contributor

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

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@jreback jreback removed this from the 1.2 milestone Aug 13, 2020
@jreback jreback modified the milestones: 1.1.2, 1.2 Aug 19, 2020
@jreback jreback merged commit eec6080 into pandas-dev:master Aug 19, 2020
@jreback
Copy link
Contributor

jreback commented Aug 19, 2020

thanks @CloseChoice very nice

@CloseChoice CloseChoice deleted the fix_groupby_resample_interpolate branch August 20, 2020 00:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Groupby Missing-data np.nan, pd.NaT, pd.NA, dropna, isnull, interpolate Resample resample method
Projects
None yet
Development

Successfully merging this pull request may close these issues.

BUG: Combination of groupby.resample.interpolate() fails
4 participants