FIX: remove epoch from style and fix tests

jklymak · jklymak · commit 2ae42f58f734 · 2020-04-27T17:49:39.000-07:00
diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle
@@ -229,7 +229,6 @@ date.autoformatter.hour   : %H:%M:%S
 date.autoformatter.minute : %H:%M:%S.%f
 date.autoformatter.second : %H:%M:%S.%f
 date.autoformatter.microsecond : %H:%M:%S.%f
-date.epoch                : 0000-12-31T00:00:00  # old epoch
 
 ### TICKS
 # see http://matplotlib.org/api/axis_api.html#matplotlib.axis.Tick
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -39,7 +39,7 @@
     'webagg.port_retries', 'webagg.open_in_browser', 'backend_fallback',
     'toolbar', 'timezone', 'datapath', 'figure.max_open_warning',
     'figure.raise_window', 'savefig.directory', 'tk.window_focus',
-    'docstring.hardcopy'}
+    'docstring.hardcopy', 'date.epoch'}
 
 
 def _remove_blacklisted_style_params(d, warn=True):
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -652,10 +652,11 @@ def test_single_date():
     plt.rcParams['axes.formatter.limits'] = -7, 7
 
     time1 = [721964.0]
+    dt = mdates.date2num(np.datetime64('0000-12-31'))
     data1 = [-65.54]
 
     fig, ax = plt.subplots(2, 1)
-    ax[0].plot_date(time1, data1, 'o', color='r')
+    ax[0].plot_date(time1 + dt, data1, 'o', color='r')
     ax[1].plot(time1, data1, 'o', color='r')
 
 
@@ -899,7 +900,7 @@ def test_axvspan_epoch():
     ax.set_xlim(t0 - 5.0*dt, tf + 5.0*dt)
 
 
-@image_comparison(['axhspan_epoch'])
+@image_comparison(['axhspan_epoch'], tol=0.02)
 def test_axhspan_epoch():
     import matplotlib.testing.jpl_units as units
     units.register()
@@ -5415,7 +5416,7 @@ def test_bar_uint8():
         assert patch.xy[0] == x
 
 
-@image_comparison(['date_timezone_x.png'])
+@image_comparison(['date_timezone_x.png'], tol=1.0)
 def test_date_timezone_x():
     # Tests issue 5575
     time_index = [datetime.datetime(2016, 2, 22, hour=x,
@@ -5450,7 +5451,7 @@ def test_date_timezone_y():
     plt.plot_date([3] * 3, time_index, tz='UTC', xdate=False, ydate=True)
 
 
-@image_comparison(['date_timezone_x_and_y.png'])
+@image_comparison(['date_timezone_x_and_y.png'], tol=1.0)
 def test_date_timezone_x_and_y():
     # Tests issue 5575
     UTC = datetime.timezone.utc
@@ -6271,7 +6272,8 @@ def test_datetime_masked():
     fig, ax = plt.subplots()
     ax.plot(x, m)
     # these are the default viewlim
-    assert ax.get_xlim() == (730120.0, 733773.0)
+    dt = mdates.date2num(np.datetime64('0000-12-31'))
+    assert ax.get_xlim() == (730120.0 + dt, 733773.0 + dt)
 
 
 def test_hist_auto_bins():
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -300,19 +300,6 @@ def test_drange():
     assert mdates.num2date(daterange[-1]) == (end - delta)
 
 
-def test_empty_date_with_year_formatter():
-    # exposes sf bug 2861426:
-    # https://sourceforge.net/tracker/?func=detail&aid=2861426&group_id=80706&atid=560720
-
-    # update: I am no longer believe this is a bug, as I commented on
-    # the tracker.  The question is now: what to do with this test
-
-    fig, ax = plt.subplots()
-    ax.xaxis.set_major_formatter(mdates.DateFormatter('%Y'))
-    with pytest.raises(ValueError):
-        fig.canvas.draw()
-
-
 @_new_epoch_decorator
 def test_auto_date_locator():
     def _create_auto_date_locator(date1, date2):
@@ -759,8 +746,8 @@ def _test_date2num_dst(date_range, tz_convert):
 
     dt_utc = date_range(start=dtstart, freq=interval, periods=N)
     dt_bxl = tz_convert(dt_utc, BRUSSELS)
-
-    expected_ordinalf = [735322.0 + (i * interval_days) for i in range(N)]
+    t0 = 735322.0 + mdates.date2num(np.datetime64('0000-12-31'))
+    expected_ordinalf = [t0 + (i * interval_days) for i in range(N)]
     actual_ordinalf = list(mdates.date2num(dt_bxl))
 
     assert actual_ordinalf == expected_ordinalf
@@ -885,10 +872,11 @@ def test_yearlocator_pytz():
     locator.create_dummy_axis()
     locator.set_view_interval(mdates.date2num(x[0])-1.0,
                               mdates.date2num(x[-1])+1.0)
-
-    np.testing.assert_allclose([733408.208333, 733773.208333, 734138.208333,
-                                734503.208333, 734869.208333,
-                                735234.208333, 735599.208333], locator())
+    t = np.array([733408.208333, 733773.208333, 734138.208333,
+                  734503.208333, 734869.208333, 735234.208333, 735599.208333])
+    # convert to new epoch from old...
+    t = t + mdates.date2num(np.datetime64('0000-12-31'))
+    np.testing.assert_allclose(t, locator())
     expected = ['2009-01-01 00:00:00-05:00',
                 '2010-01-01 00:00:00-05:00', '2011-01-01 00:00:00-05:00',
                 '2012-01-01 00:00:00-05:00', '2013-01-01 00:00:00-05:00',
@@ -926,18 +914,19 @@ def test_num2timedelta(x, tdelta):
 def test_datetime64_in_list():
     dt = [np.datetime64('2000-01-01'), np.datetime64('2001-01-01')]
     dn = mdates.date2num(dt)
-    np.testing.assert_equal(dn, [730120.,  730486.])
+    # convert fixed values from old to new epoch
+    t = (np.array([730120.,  730486.]) +
+         mdates.date2num(np.datetime64('0000-12-31')))
+    np.testing.assert_equal(dn, t)
 
 
 def test_change_epoch():
     date = np.datetime64('2000-01-01')
-    # old epoch (style=Classic)
-    np.testing.assert_equal(mdates.date2num(date), 730120.0)
 
     with pytest.raises(RuntimeError):
         # this should fail here because there is a sentinel on the epoch
         # if the epoch has been used then it cannot be set.
-        mdates.set_epoch('1970-01-01')
+        mdates.set_epoch('0000-01-01')
 
     # use private method to clear the epoch and allow it to be set...
     mdates._reset_epoch_test_example()
