Skip to content

Commit cef33b7

Browse files
Update code for failing tests
1 parent dc4fbec commit cef33b7

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

doc/source/whatsnew/v0.15.0.rst

+1
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,7 @@ Other:
10301030
If ``Period`` freq is ``D``, ``H``, ``T``, ``S``, ``L``, ``U``, ``N``, ``Timedelta``-like can be added if the result can have same freq. Otherwise, only the same ``offsets`` can be added.
10311031

10321032
.. ipython:: python
1033+
:okwarning:
10331034
10341035
idx = pd.period_range('2014-07-01 09:00', periods=5, freq='H')
10351036
idx

pandas/tests/generic/test_series.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def test_shift_always_copy(self, s, shift_size):
174174
# GH22397
175175
assert s.shift(shift_size) is not s
176176

177-
@pytest.mark.parametrize("move_by_freq", [pd.Timedelta("1D"), pd.Timedelta("1M")])
177+
@pytest.mark.parametrize("move_by_freq", [pd.Timedelta("1D"), pd.Timedelta("1min")])
178178
def test_datetime_shift_always_copy(self, move_by_freq):
179179
# GH22397
180180
s = pd.Series(range(5), index=pd.date_range("2017", periods=5))

pandas/tests/indexes/interval/test_interval.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def test_properties(self, closed):
8686
[1, 1, 2, 5, 15, 53, 217, 1014, 5335, 31240, 201608],
8787
[-np.inf, -100, -10, 0.5, 1, 1.5, 3.8, 101, 202, np.inf],
8888
pd.to_datetime(["20170101", "20170202", "20170303", "20170404"]),
89-
pd.to_timedelta(["1ns", "2ms", "3s", "4M", "5H", "6D"]),
89+
pd.to_timedelta(["1ns", "2ms", "3s", "4min", "5H", "6D"]),
9090
],
9191
)
9292
def test_length(self, closed, breaks):

pandas/tests/resample/test_datetime_index.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,8 @@ def test_resample_origin():
752752
resampled = ts.resample("5min", origin=offset_timestamp).mean()
753753
tm.assert_index_equal(resampled.index, exp_rng)
754754

755-
resampled = ts.resample("5min", origin="epoch", offset="2m").mean()
755+
with tm.assert_produces_warning(FutureWarning, check_stacklevel=False):
756+
resampled = ts.resample("5min", origin="epoch", offset="2m").mean()
756757
tm.assert_index_equal(resampled.index, exp_rng)
757758

758759
# origin of '1999-31-12 12:02:00' should be equivalent for this case
@@ -831,7 +832,8 @@ def test_resample_origin_with_tz():
831832
resampled = ts.resample("5min", origin="1999-12-31 12:02:00+03:00").mean()
832833
tm.assert_index_equal(resampled.index, exp_rng)
833834

834-
resampled = ts.resample("5min", origin="epoch", offset="2m").mean()
835+
with tm.assert_produces_warning(FutureWarning, check_stacklevel=False):
836+
resampled = ts.resample("5min", origin="epoch", offset="2m").mean()
835837
tm.assert_index_equal(resampled.index, exp_rng)
836838

837839
with pytest.raises(ValueError, match=msg):

pandas/tests/scalar/timedelta/test_constructors.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import pytest
55

66
from pandas import Timedelta, offsets, to_timedelta
7+
import pandas._testing as tm
78

89

910
def test_construction():
@@ -40,8 +41,9 @@ def test_construction():
4041
assert Timedelta("1 hr") == timedelta(hours=1)
4142
assert Timedelta("1 hours") == timedelta(hours=1)
4243
assert Timedelta("-1 hours") == -timedelta(hours=1)
43-
assert Timedelta("1 m") == timedelta(minutes=1)
44-
assert Timedelta("1.5 m") == timedelta(seconds=90)
44+
with tm.assert_produces_warning(FutureWarning, check_stacklevel=False):
45+
assert Timedelta("1 m") == timedelta(minutes=1)
46+
assert Timedelta("1.5 m") == timedelta(seconds=90)
4547
assert Timedelta("1 minute") == timedelta(minutes=1)
4648
assert Timedelta("1 minutes") == timedelta(minutes=1)
4749
assert Timedelta("1 s") == timedelta(seconds=1)

pandas/tests/scalar/timedelta/test_timedelta.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ def test_nat_converters(self):
164164
[(value, "W", False) for value in ["W", "w"]]
165165
+ [(value, "D", False) for value in ["D", "d", "days", "day", "Days", "Day"]]
166166
+ [
167-
(value, "m", FutureWarning if value == "m" else False)
167+
(value, "m", FutureWarning if value == "m" else False) # type: ignore[misc]
168168
for value in [
169169
"m",
170170
"minute",

0 commit comments

Comments
 (0)