Update parse_iso_format_string and tests that give warnings

Author: avinashpancham

doc/source/whatsnew/v0.15.0.rst

@@ -163,7 +163,7 @@ Access fields for a ``Timedelta``
 
 .. ipython:: python
 
-   td = pd.Timedelta('1 hour 3m 15.5us')
+   td = pd.Timedelta('1 hour 3min 15.5us')
    td.seconds
    td.microseconds
    td.nanoseconds
@@ -1030,12 +1030,11 @@ Other:
   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.
 
   .. ipython:: python
-    :okwarning:
 
      idx = pd.period_range('2014-07-01 09:00', periods=5, freq='H')
      idx
      idx + pd.offsets.Hour(2)
-     idx + pd.Timedelta('120m')
+     idx + pd.Timedelta('120min')
 
      idx = pd.period_range('2014-07', periods=5, freq='M')
      idx

pandas/_libs/tslibs/timedeltas.pyx

@@ -645,9 +645,11 @@ cdef inline int64_t parse_iso_format_string(str ts) except? -1:
                 else:
                     neg = 1
             elif c in ['W', 'D', 'H', 'M']:
-                unit.append(c)
                 if c in ['H', 'M'] and len(number) > 2:
                     raise ValueError(err_msg)
+                if c == 'M':
+                    c = 'min'
+                unit.append(c)
                 r = timedelta_from_spec(number, '0', unit)
                 result += timedelta_as_neg(r, neg)
 

pandas/tests/arithmetic/conftest.py

@@ -113,9 +113,9 @@ def numeric_idx(request):
 
 @pytest.fixture(
     params=[
-        pd.Timedelta("5m4s").to_pytimedelta(),
-        pd.Timedelta("5m4s"),
-        pd.Timedelta("5m4s").to_timedelta64(),
+        pd.Timedelta("5min4s").to_pytimedelta(),
+        pd.Timedelta("5min4s"),
+        pd.Timedelta("5min4s").to_timedelta64(),
     ],
     ids=lambda x: type(x).__name__,
 )

pandas/tests/arithmetic/test_timedelta64.py

@@ -1860,8 +1860,8 @@ def test_td64arr_floordiv_tdlike_scalar(self, two_hours, box_with_array):
         "scalar_td",
         [
             timedelta(minutes=10, seconds=7),
-            Timedelta("10m7s"),
-            Timedelta("10m7s").to_timedelta64(),
+            Timedelta("10min7s"),
+            Timedelta("10min7s").to_timedelta64(),
         ],
         ids=lambda x: type(x).__name__,
     )
@@ -2060,7 +2060,7 @@ def test_td64arr_div_numeric_array(self, box_with_array, vector, any_real_dtype)
         tdser = Series(["59 Days", "59 Days", "NaT"], dtype="m8[ns]")
         vector = vector.astype(any_real_dtype)
 
-        expected = Series(["2.95D", "1D 23H 12m", "NaT"], dtype="timedelta64[ns]")
+        expected = Series(["2.95D", "1D 23H 12min", "NaT"], dtype="timedelta64[ns]")
 
         tdser = tm.box_expected(tdser, box_with_array)
         expected = tm.box_expected(expected, xbox)

pandas/tests/arrays/test_timedeltas.py

@@ -271,7 +271,7 @@ def test_std(self):
         assert result is pd.NaT
 
     def test_median(self):
-        tdi = pd.TimedeltaIndex(["0H", "3H", "NaT", "5H06m", "0H", "2H"])
+        tdi = pd.TimedeltaIndex(["0H", "3H", "NaT", "5H06min", "0H", "2H"])
         arr = tdi.array
 
         result = arr.median(skipna=True)

pandas/tests/resample/test_datetime_index.py

@@ -759,7 +759,7 @@ def test_resample_origin():
     resampled = ts.resample("5min", origin="1999-12-31 12:02:00").mean()
     tm.assert_index_equal(resampled.index, exp_rng)
 
-    resampled = ts.resample("5min", offset="-3m").mean()
+    resampled = ts.resample("5min", offset="-3min").mean()
     tm.assert_index_equal(resampled.index, exp_rng)
 
 
@@ -831,8 +831,7 @@ def test_resample_origin_with_tz():
     resampled = ts.resample("5min", origin="1999-12-31 12:02:00+03:00").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)
 
     with pytest.raises(ValueError, match=msg):

pandas/tests/scalar/interval/test_interval.py

@@ -79,8 +79,8 @@ def test_hash(self, interval):
             (-np.inf, np.inf, np.inf),
             (Timedelta("0 days"), Timedelta("5 days"), Timedelta("5 days")),
             (Timedelta("10 days"), Timedelta("10 days"), Timedelta("0 days")),
-            (Timedelta("1H10M"), Timedelta("5H5M"), Timedelta("3H55M")),
-            (Timedelta("5S"), Timedelta("1H"), Timedelta("59M55S")),
+            (Timedelta("1H10min"), Timedelta("5H5min"), Timedelta("3H55min")),
+            (Timedelta("5S"), Timedelta("1H"), Timedelta("59min55S")),
         ],
     )
     def test_length(self, left, right, expected):

pandas/tests/scalar/timedelta/test_constructors.py

@@ -62,31 +62,31 @@ def test_construction():
     # combos
     assert Timedelta("10 days 1 hour") == timedelta(days=10, hours=1)
     assert Timedelta("10 days 1 h") == timedelta(days=10, hours=1)
-    assert Timedelta("10 days 1 h 1m 1s") == timedelta(
+    assert Timedelta("10 days 1 h 1min 1s") == timedelta(
         days=10, hours=1, minutes=1, seconds=1
     )
-    assert Timedelta("-10 days 1 h 1m 1s") == -timedelta(
+    assert Timedelta("-10 days 1 h 1min 1s") == -timedelta(
         days=10, hours=1, minutes=1, seconds=1
     )
-    assert Timedelta("-10 days 1 h 1m 1s") == -timedelta(
+    assert Timedelta("-10 days 1 h 1min 1s") == -timedelta(
         days=10, hours=1, minutes=1, seconds=1
     )
-    assert Timedelta("-10 days 1 h 1m 1s 3us") == -timedelta(
+    assert Timedelta("-10 days 1 h 1min 1s 3us") == -timedelta(
         days=10, hours=1, minutes=1, seconds=1, microseconds=3
     )
-    assert Timedelta("-10 days 1 h 1.5m 1s 3us") == -timedelta(
+    assert Timedelta("-10 days 1 h 1.5min 1s 3us") == -timedelta(
         days=10, hours=1, minutes=1, seconds=31, microseconds=3
     )
 
     # Currently invalid as it has a - on the hh:mm:dd part
     # (only allowed on the days)
     msg = "only leading negative signs are allowed"
     with pytest.raises(ValueError, match=msg):
-        Timedelta("-10 days -1 h 1.5m 1s 3us")
+        Timedelta("-10 days -1 h 1.5min 1s 3us")
 
     # only leading neg signs are allowed
     with pytest.raises(ValueError, match=msg):
-        Timedelta("10 days -1 h 1.5m 1s 3us")
+        Timedelta("10 days -1 h 1.5min 1s 3us")
 
     # no units specified
     msg = "no units specified"

pandas/tests/scalar/timedelta/test_timedelta.py

@@ -309,7 +309,7 @@ def test_timedelta_conversions(self):
 
     def test_to_numpy_alias(self):
         # GH 24653: alias .to_numpy() for scalars
-        td = Timedelta("10m7s")
+        td = Timedelta("10min7s")
         assert td.to_timedelta64() == td.to_numpy()
 
     @pytest.mark.parametrize(