Backport PR #17983: FIX: undeprecate and update num2epoch/epoch2num

jklymak · jklymak · commit b50fa140ca90 · 2020-07-20T22:01:04.000-07:00
diff --git a/doc/api/api_changes_3.4/deprecations.rst b/doc/api/api_changes_3.4/deprecations.rst
@@ -1,2 +1,11 @@
 Deprecations
 ------------
+
+Reverted deprecation of `~.dates.num2epoch` and `~.dates.epoch2num`
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These two functions were deprecated in 3.3.0, and did not return
+an accurate Matplotlib datenum relative to the new Matplotlib epoch
+handling (`~.dates.get_epoch` and :rc:`date.epoch`).  This version
+reverts the deprecation and fixes those functions to work with
+`~.dates.get_epoch`.
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -949,57 +949,6 @@ def test_change_epoch():
         0.5)
 
 
-def test_warn_notintervals():
-    dates = np.arange('2001-01-10', '2001-03-04', dtype='datetime64[D]')
-    locator = mdates.AutoDateLocator(interval_multiples=False)
-    locator.intervald[3] = [2]
-    locator.create_dummy_axis()
-    locator.set_view_interval(mdates.date2num(dates[0]),
-                              mdates.date2num(dates[-1]))
-    with pytest.warns(UserWarning, match="AutoDateLocator was unable") as rec:
-        locs = locator()
-
-
-def test_change_converter():
-    plt.rcParams['date.converter'] = 'concise'
-    dates = np.arange('2020-01-01', '2020-05-01', dtype='datetime64[D]')
-    fig, ax = plt.subplots()
-
-    ax.plot(dates, np.arange(len(dates)))
-    fig.canvas.draw()
-    assert ax.get_xticklabels()[0].get_text() == 'Jan'
-    assert ax.get_xticklabels()[1].get_text() == '15'
-
-    plt.rcParams['date.converter'] = 'auto'
-    fig, ax = plt.subplots()
-
-    ax.plot(dates, np.arange(len(dates)))
-    fig.canvas.draw()
-    assert ax.get_xticklabels()[0].get_text() == 'Jan 01 2020'
-    assert ax.get_xticklabels()[1].get_text() == 'Jan 15 2020'
-    with pytest.warns(UserWarning) as rec:
-        plt.rcParams['date.converter'] = 'boo'
-
-
-def test_change_interval_multiples():
-    plt.rcParams['date.interval_multiples'] = False
-    dates = np.arange('2020-01-10', '2020-05-01', dtype='datetime64[D]')
-    fig, ax = plt.subplots()
-
-    ax.plot(dates, np.arange(len(dates)))
-    fig.canvas.draw()
-    assert ax.get_xticklabels()[0].get_text() == 'Jan 10 2020'
-    assert ax.get_xticklabels()[1].get_text() == 'Jan 24 2020'
-
-    plt.rcParams['date.interval_multiples'] = 'True'
-    fig, ax = plt.subplots()
-
-    ax.plot(dates, np.arange(len(dates)))
-    fig.canvas.draw()
-    assert ax.get_xticklabels()[0].get_text() == 'Jan 15 2020'
-    assert ax.get_xticklabels()[1].get_text() == 'Feb 01 2020'
-
-
 def test_epoch2num():
     mdates._reset_epoch_test_example()
     mdates.set_epoch('0000-12-31')
