Move warning location and update tests

Author: avinashpancham

pandas/_libs/tslibs/timedeltas.pyx

@@ -299,14 +299,6 @@ cdef inline int64_t parse_timedelta_string(str ts) except? -1:
     if len(ts) == 0 or ts in nat_strings:
         return NPY_NAT
 
-    if re.search(r"^\d+\s?[M|Y|m|y]$", ts):
-        warnings.warn(
-            "Units 'M', 'Y', 'm' and 'y' do not represent unambiguous "
-            "timedelta values and will be removed in a future version",
-            FutureWarning,
-            stacklevel=2,
-        )
-
     for c in ts:
 
         # skip whitespace / commas
@@ -476,6 +468,15 @@ cdef inline timedelta_from_spec(object number, object frac, object unit):
 
     try:
         unit = ''.join(unit)
+
+        if unit in ["M", "Y", "m", "y"]:
+            warnings.warn(
+                "Units 'M', 'Y', 'm' and 'y' do not represent unambiguous "
+                "timedelta values and will be removed in a future version",
+                FutureWarning,
+                stacklevel=2,
+            )
+
         if unit == 'M':
             # To parse ISO 8601 string, 'M' should be treated as minute,
             # not month

pandas/tests/resample/test_datetime_index.py

@@ -752,8 +752,7 @@ def test_resample_origin():
     resampled = ts.resample("5min", origin=offset_timestamp).mean()
     tm.assert_index_equal(resampled.index, exp_rng)
 
-    with tm.assert_produces_warning(FutureWarning, check_stacklevel=False):
-        resampled = ts.resample("5min", origin="epoch", offset="2m").mean()
+    resampled = ts.resample("5min", origin="epoch", offset="2min").mean()
     tm.assert_index_equal(resampled.index, exp_rng)
 
     # origin of '1999-31-12 12:02:00' should be equivalent for this case

pandas/tests/scalar/timedelta/test_constructors.py

@@ -4,7 +4,6 @@
 import pytest
 
 from pandas import Timedelta, offsets, to_timedelta
-import pandas._testing as tm
 
 
 def test_construction():
@@ -41,9 +40,8 @@ def test_construction():
     assert Timedelta("1 hr") == timedelta(hours=1)
     assert Timedelta("1 hours") == timedelta(hours=1)
     assert Timedelta("-1 hours") == -timedelta(hours=1)
-    with tm.assert_produces_warning(FutureWarning, check_stacklevel=False):
-        assert Timedelta("1 m") == timedelta(minutes=1)
-        assert Timedelta("1.5 m") == timedelta(seconds=90)
+    assert Timedelta("1 min") == timedelta(minutes=1)
+    assert Timedelta("1.5 min") == timedelta(seconds=90)
     assert Timedelta("1 minute") == timedelta(minutes=1)
     assert Timedelta("1 minutes") == timedelta(minutes=1)
     assert Timedelta("1 s") == timedelta(seconds=1)