Skip to content

Commit

Permalink
TST: fix deprecation test
Browse files Browse the repository at this point in the history
  • Loading branch information
hasB4K committed May 9, 2020
1 parent 104676c commit bdd1656
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v1.1.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Small example of the use of ``origin``:
ts = pd.Series(np.arange(len(rng)) * 3, index=rng)
ts
Resample with the default behavior 'start_day' (origin is 2000-10-01 00:00:00):
Resample with the default behavior ``'start_day'`` (origin is ``2000-10-01 00:00:00``):

.. ipython:: python
Expand Down
5 changes: 3 additions & 2 deletions pandas/tests/resample/test_deprecated.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ def test_deprecating_on_loffset_and_base():
with tm.assert_produces_warning(FutureWarning):
df.resample("3T", loffset="0s").sum()
msg = "'offset' and 'base' cannot be present at the same time"
with pytest.raises(ValueError, match=msg):
df.groupby("a").resample("3T", base=0, offset=0).sum()
with tm.assert_produces_warning(FutureWarning):
with pytest.raises(ValueError, match=msg):
df.groupby("a").resample("3T", base=0, offset=0).sum()


@all_ts
Expand Down

0 comments on commit bdd1656

Please sign in to comment.